From 53147edff1ef11af99c8ffb80b829c8b3fc53b30 Mon Sep 17 00:00:00 2001
From: Anders Blomdell <anders.blomdell@control.lth.se>
Date: Tue, 3 Mar 2015 19:03:15 +0100
Subject: [PATCH] Renamed java to labcomm2014
---
compiler/2014/Java_CodeGen.jrag | 2 +-
examples/dynamic/test/DynamicPart.java | 8 ++++----
examples/dynamic/test/StaticDecoder.java | 2 +-
examples/dynamic/test/StaticEncoder.java | 2 +-
examples/dynamic/test/TestLabCommCompiler.java | 8 ++++----
examples/dynamic/test/TestLabcommGen.java | 8 ++++----
.../jgrafchart/labcommTCPtest/client/TestClient.java | 4 ++--
.../labcommTCPtest/client/TestClientSingleshot.java | 4 ++--
.../jgrafchart/labcommTCPtest/server/TestServer.java | 4 ++--
examples/simple/Decoder.java | 2 +-
examples/simple/Encoder.java | 2 +-
examples/simple/EncoderIS.java | 2 +-
examples/tcp/labcommTCPtest/client/TestClient.java | 4 ++--
.../labcommTCPtest/client/TestClientSingleshot.java | 4 ++--
examples/tcp/labcommTCPtest/server/OneShotServer.java | 4 ++--
examples/tcp/labcommTCPtest/server/TestServer.java | 4 ++--
examples/user_types/Decoder.java | 8 ++++----
examples/user_types/Encoder.java | 2 +-
examples/user_types/TDDecoder.java | 10 +++++-----
examples/wiki_example/example_decoder_encoder.java | 4 ++--
lib/java/Makefile | 10 +++++-----
lib/java/se/lth/control/labcomm/SampleType.java | 5 -----
.../control/{labcomm => labcomm2014}/ASTbuilder.java | 6 +++---
.../control/{labcomm => labcomm2014}/BuiltinType.java | 2 +-
.../lth/control/{labcomm => labcomm2014}/Constant.java | 2 +-
.../lth/control/{labcomm => labcomm2014}/Decoder.java | 2 +-
.../{labcomm => labcomm2014}/DecoderChannel.java | 2 +-
.../{labcomm => labcomm2014}/DecoderRegistry.java | 2 +-
.../lth/control/{labcomm => labcomm2014}/Encoder.java | 2 +-
.../{labcomm => labcomm2014}/EncoderChannel.java | 2 +-
.../{labcomm => labcomm2014}/EncoderRegistry.java | 2 +-
.../lth/control/{labcomm => labcomm2014}/Reader.java | 2 +-
.../lth/control/{labcomm => labcomm2014}/Sample.java | 2 +-
.../{labcomm => labcomm2014}/SampleDispatcher.java | 2 +-
.../{labcomm => labcomm2014}/SampleHandler.java | 2 +-
lib/java/se/lth/control/labcomm2014/SampleType.java | 5 +++++
.../control/{labcomm => labcomm2014}/TypeBinding.java | 10 +++++-----
.../lth/control/{labcomm => labcomm2014}/TypeDef.java | 10 +++++-----
.../{labcomm => labcomm2014}/TypeDefParser.java | 10 +++++-----
.../lth/control/{labcomm => labcomm2014}/Writer.java | 2 +-
.../{labcomm => labcomm2014}/WriterWrapper.java | 2 +-
test/relay_gen_java.py | 6 +++---
42 files changed, 89 insertions(+), 89 deletions(-)
delete mode 100644 lib/java/se/lth/control/labcomm/SampleType.java
rename lib/java/se/lth/control/{labcomm => labcomm2014}/ASTbuilder.java (97%)
rename lib/java/se/lth/control/{labcomm => labcomm2014}/BuiltinType.java (59%)
rename lib/java/se/lth/control/{labcomm => labcomm2014}/Constant.java (97%)
rename lib/java/se/lth/control/{labcomm => labcomm2014}/Decoder.java (95%)
rename lib/java/se/lth/control/{labcomm => labcomm2014}/DecoderChannel.java (99%)
rename lib/java/se/lth/control/{labcomm => labcomm2014}/DecoderRegistry.java (99%)
rename lib/java/se/lth/control/{labcomm => labcomm2014}/Encoder.java (96%)
rename lib/java/se/lth/control/{labcomm => labcomm2014}/EncoderChannel.java (99%)
rename lib/java/se/lth/control/{labcomm => labcomm2014}/EncoderRegistry.java (97%)
rename lib/java/se/lth/control/{labcomm => labcomm2014}/Reader.java (70%)
rename lib/java/se/lth/control/{labcomm => labcomm2014}/Sample.java (72%)
rename lib/java/se/lth/control/{labcomm => labcomm2014}/SampleDispatcher.java (95%)
rename lib/java/se/lth/control/{labcomm => labcomm2014}/SampleHandler.java (50%)
create mode 100644 lib/java/se/lth/control/labcomm2014/SampleType.java
rename lib/java/se/lth/control/{labcomm => labcomm2014}/TypeBinding.java (93%)
rename lib/java/se/lth/control/{labcomm => labcomm2014}/TypeDef.java (93%)
rename lib/java/se/lth/control/{labcomm => labcomm2014}/TypeDefParser.java (98%)
rename lib/java/se/lth/control/{labcomm => labcomm2014}/Writer.java (75%)
rename lib/java/se/lth/control/{labcomm => labcomm2014}/WriterWrapper.java (88%)
diff --git a/compiler/2014/Java_CodeGen.jrag b/compiler/2014/Java_CodeGen.jrag
index 62a59ef..cb0f628 100644
--- a/compiler/2014/Java_CodeGen.jrag
+++ b/compiler/2014/Java_CodeGen.jrag
@@ -79,7 +79,7 @@ aspect Java_CodeGenEnv {
private Java_env(int version, int indent) {
this.version = version;
- this.verStr = LabCommVersion.versionString(version);
+ this.verStr = "2014";
this.indent = indent;
}
diff --git a/examples/dynamic/test/DynamicPart.java b/examples/dynamic/test/DynamicPart.java
index a313722..5e98f51 100644
--- a/examples/dynamic/test/DynamicPart.java
+++ b/examples/dynamic/test/DynamicPart.java
@@ -18,10 +18,10 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.Map;
-import se.lth.control.labcomm.Decoder;
-import se.lth.control.labcomm.DecoderChannel;
-import se.lth.control.labcomm.Encoder;
-import se.lth.control.labcomm.EncoderChannel;
+import se.lth.control.labcomm2014.Decoder;
+import se.lth.control.labcomm2014.DecoderChannel;
+import se.lth.control.labcomm2014.Encoder;
+import se.lth.control.labcomm2014.EncoderChannel;
import AST.Parser;
import AST.Scanner;
import AST.Program;
diff --git a/examples/dynamic/test/StaticDecoder.java b/examples/dynamic/test/StaticDecoder.java
index c1c06d3..1286b00 100644
--- a/examples/dynamic/test/StaticDecoder.java
+++ b/examples/dynamic/test/StaticDecoder.java
@@ -6,7 +6,7 @@ import gen.bar;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
-import se.lth.control.labcomm.DecoderChannel;
+import se.lth.control.labcomm2014.DecoderChannel;
public class StaticDecoder implements foo.Handler, bar.Handler
diff --git a/examples/dynamic/test/StaticEncoder.java b/examples/dynamic/test/StaticEncoder.java
index 4ea48be..0bfb534 100644
--- a/examples/dynamic/test/StaticEncoder.java
+++ b/examples/dynamic/test/StaticEncoder.java
@@ -2,7 +2,7 @@ package test;
import java.io.File;
import java.io.FileOutputStream;
import java.io.OutputStream;
-import se.lth.control.labcomm.EncoderChannel;
+import se.lth.control.labcomm2014.EncoderChannel;
import gen.foo;
import gen.bar;
diff --git a/examples/dynamic/test/TestLabCommCompiler.java b/examples/dynamic/test/TestLabCommCompiler.java
index fe9f5e6..b078345 100644
--- a/examples/dynamic/test/TestLabCommCompiler.java
+++ b/examples/dynamic/test/TestLabCommCompiler.java
@@ -16,10 +16,10 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.Map;
-import se.lth.control.labcomm.Decoder;
-import se.lth.control.labcomm.DecoderChannel;
-import se.lth.control.labcomm.Encoder;
-import se.lth.control.labcomm.EncoderChannel;
+import se.lth.control.labcomm2014.Decoder;
+import se.lth.control.labcomm2014.DecoderChannel;
+import se.lth.control.labcomm2014.Encoder;
+import se.lth.control.labcomm2014.EncoderChannel;
import AST.Parser;
import AST.Scanner;
import AST.Program;
diff --git a/examples/dynamic/test/TestLabcommGen.java b/examples/dynamic/test/TestLabcommGen.java
index 7ff4e03..b35f502 100644
--- a/examples/dynamic/test/TestLabcommGen.java
+++ b/examples/dynamic/test/TestLabcommGen.java
@@ -18,10 +18,10 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.Map;
-import se.lth.control.labcomm.Decoder;
-import se.lth.control.labcomm.DecoderChannel;
-import se.lth.control.labcomm.Encoder;
-import se.lth.control.labcomm.EncoderChannel;
+import se.lth.control.labcomm2014.Decoder;
+import se.lth.control.labcomm2014.DecoderChannel;
+import se.lth.control.labcomm2014.Encoder;
+import se.lth.control.labcomm2014.EncoderChannel;
import AST.Parser;
import AST.Scanner;
import AST.Program;
diff --git a/examples/jgrafchart/labcommTCPtest/client/TestClient.java b/examples/jgrafchart/labcommTCPtest/client/TestClient.java
index 66fa134..acc2a36 100644
--- a/examples/jgrafchart/labcommTCPtest/client/TestClient.java
+++ b/examples/jgrafchart/labcommTCPtest/client/TestClient.java
@@ -6,8 +6,8 @@ import java.io.OutputStream;
import java.net.Socket;
import java.net.UnknownHostException;
-import se.lth.control.labcomm.DecoderChannel;
-import se.lth.control.labcomm.EncoderChannel;
+import se.lth.control.labcomm2014.DecoderChannel;
+import se.lth.control.labcomm2014.EncoderChannel;
import labcommTCPtest.gen.foo;
import labcommTCPtest.gen.foo.Handler;
diff --git a/examples/jgrafchart/labcommTCPtest/client/TestClientSingleshot.java b/examples/jgrafchart/labcommTCPtest/client/TestClientSingleshot.java
index 9601bca..1bf43e7 100644
--- a/examples/jgrafchart/labcommTCPtest/client/TestClientSingleshot.java
+++ b/examples/jgrafchart/labcommTCPtest/client/TestClientSingleshot.java
@@ -6,8 +6,8 @@ import java.io.OutputStream;
import java.net.Socket;
import java.net.UnknownHostException;
-import se.lth.control.labcomm.DecoderChannel;
-import se.lth.control.labcomm.EncoderChannel;
+import se.lth.control.labcomm2014.DecoderChannel;
+import se.lth.control.labcomm2014.EncoderChannel;
import labcommTCPtest.gen.FooSample;
import labcommTCPtest.gen.FooSample.Handler;
diff --git a/examples/jgrafchart/labcommTCPtest/server/TestServer.java b/examples/jgrafchart/labcommTCPtest/server/TestServer.java
index 4b95a36..3505312 100644
--- a/examples/jgrafchart/labcommTCPtest/server/TestServer.java
+++ b/examples/jgrafchart/labcommTCPtest/server/TestServer.java
@@ -8,8 +8,8 @@ import java.lang.reflect.Method;
import java.net.ServerSocket;
import java.net.Socket;
-import se.lth.control.labcomm.DecoderChannel;
-import se.lth.control.labcomm.EncoderChannel;
+import se.lth.control.labcomm2014.DecoderChannel;
+import se.lth.control.labcomm2014.EncoderChannel;
import labcommTCPtest.gen.foo;
import labcommTCPtest.gen.foo.Handler;
diff --git a/examples/simple/Decoder.java b/examples/simple/Decoder.java
index 48dd3ed..0adc777 100644
--- a/examples/simple/Decoder.java
+++ b/examples/simple/Decoder.java
@@ -2,7 +2,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
-import se.lth.control.labcomm.DecoderChannel;
+import se.lth.control.labcomm2014.DecoderChannel;
public class Decoder
implements theTwoInts.Handler, anotherTwoInts.Handler, IntString.Handler, TwoArrays.Handler, TwoFixedArrays.Handler, doavoid.Handler
diff --git a/examples/simple/Encoder.java b/examples/simple/Encoder.java
index 15e4858..061e91f 100644
--- a/examples/simple/Encoder.java
+++ b/examples/simple/Encoder.java
@@ -2,7 +2,7 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.OutputStream;
-import se.lth.control.labcomm.EncoderChannel;
+import se.lth.control.labcomm2014.EncoderChannel;
/**
* Simple encoder
diff --git a/examples/simple/EncoderIS.java b/examples/simple/EncoderIS.java
index 4d7fd3a..4bdb99b 100644
--- a/examples/simple/EncoderIS.java
+++ b/examples/simple/EncoderIS.java
@@ -2,7 +2,7 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.OutputStream;
-import se.lth.control.labcomm.EncoderChannel;
+import se.lth.control.labcomm2014.EncoderChannel;
/**
* Simple encoder
diff --git a/examples/tcp/labcommTCPtest/client/TestClient.java b/examples/tcp/labcommTCPtest/client/TestClient.java
index fcd621e..42844f7 100644
--- a/examples/tcp/labcommTCPtest/client/TestClient.java
+++ b/examples/tcp/labcommTCPtest/client/TestClient.java
@@ -6,8 +6,8 @@ import java.io.OutputStream;
import java.net.Socket;
import java.net.UnknownHostException;
-import se.lth.control.labcomm.DecoderChannel;
-import se.lth.control.labcomm.EncoderChannel;
+import se.lth.control.labcomm2014.DecoderChannel;
+import se.lth.control.labcomm2014.EncoderChannel;
import labcommTCPtest.gen.FooSample;
import labcommTCPtest.gen.FooSample.Handler;
diff --git a/examples/tcp/labcommTCPtest/client/TestClientSingleshot.java b/examples/tcp/labcommTCPtest/client/TestClientSingleshot.java
index 9601bca..1bf43e7 100644
--- a/examples/tcp/labcommTCPtest/client/TestClientSingleshot.java
+++ b/examples/tcp/labcommTCPtest/client/TestClientSingleshot.java
@@ -6,8 +6,8 @@ import java.io.OutputStream;
import java.net.Socket;
import java.net.UnknownHostException;
-import se.lth.control.labcomm.DecoderChannel;
-import se.lth.control.labcomm.EncoderChannel;
+import se.lth.control.labcomm2014.DecoderChannel;
+import se.lth.control.labcomm2014.EncoderChannel;
import labcommTCPtest.gen.FooSample;
import labcommTCPtest.gen.FooSample.Handler;
diff --git a/examples/tcp/labcommTCPtest/server/OneShotServer.java b/examples/tcp/labcommTCPtest/server/OneShotServer.java
index b79b93e..647ed19 100644
--- a/examples/tcp/labcommTCPtest/server/OneShotServer.java
+++ b/examples/tcp/labcommTCPtest/server/OneShotServer.java
@@ -6,8 +6,8 @@ import java.io.OutputStream;
import java.net.Socket;
import java.net.ServerSocket;
-import se.lth.control.labcomm.DecoderChannel;
-import se.lth.control.labcomm.EncoderChannel;
+import se.lth.control.labcomm2014.DecoderChannel;
+import se.lth.control.labcomm2014.EncoderChannel;
import labcommTCPtest.gen.FooSample;
public class OneShotServer {//implements Handler {
diff --git a/examples/tcp/labcommTCPtest/server/TestServer.java b/examples/tcp/labcommTCPtest/server/TestServer.java
index 441bac4..e17dabd 100644
--- a/examples/tcp/labcommTCPtest/server/TestServer.java
+++ b/examples/tcp/labcommTCPtest/server/TestServer.java
@@ -8,8 +8,8 @@ import java.lang.reflect.Method;
import java.net.ServerSocket;
import java.net.Socket;
-import se.lth.control.labcomm.DecoderChannel;
-import se.lth.control.labcomm.EncoderChannel;
+import se.lth.control.labcomm2014.DecoderChannel;
+import se.lth.control.labcomm2014.EncoderChannel;
import labcommTCPtest.gen.FooSample;
import labcommTCPtest.gen.FooSample.Handler;
diff --git a/examples/user_types/Decoder.java b/examples/user_types/Decoder.java
index 29069b1..a0e7521 100644
--- a/examples/user_types/Decoder.java
+++ b/examples/user_types/Decoder.java
@@ -3,10 +3,10 @@ import java.io.FileInputStream;
import java.io.InputStream;
import java.io.IOException;
-import se.lth.control.labcomm.DecoderChannel;
-import se.lth.control.labcomm.TypeDef;
-import se.lth.control.labcomm.TypeDefParser;
-//import se.lth.control.labcomm.TypeBinding;
+import se.lth.control.labcomm2014.DecoderChannel;
+import se.lth.control.labcomm2014.TypeDef;
+import se.lth.control.labcomm2014.TypeDefParser;
+//import se.lth.control.labcomm2014.TypeBinding;
public class Decoder
implements twoLines.Handler,
diff --git a/examples/user_types/Encoder.java b/examples/user_types/Encoder.java
index d5687a2..58f6cd0 100644
--- a/examples/user_types/Encoder.java
+++ b/examples/user_types/Encoder.java
@@ -2,7 +2,7 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.OutputStream;
-import se.lth.control.labcomm.EncoderChannel;
+import se.lth.control.labcomm2014.EncoderChannel;
/**
* Simple encoder
diff --git a/examples/user_types/TDDecoder.java b/examples/user_types/TDDecoder.java
index 6bfdb3c..1c56a72 100644
--- a/examples/user_types/TDDecoder.java
+++ b/examples/user_types/TDDecoder.java
@@ -3,11 +3,11 @@ import java.io.FileInputStream;
import java.io.InputStream;
import java.io.IOException;
-import se.lth.control.labcomm.DecoderChannel;
-import se.lth.control.labcomm.TypeDef;
-import se.lth.control.labcomm.TypeDefParser;
-import se.lth.control.labcomm.ASTbuilder;
-//import se.lth.control.labcomm.TypeBinding;
+import se.lth.control.labcomm2014.DecoderChannel;
+import se.lth.control.labcomm2014.TypeDef;
+import se.lth.control.labcomm2014.TypeDefParser;
+import se.lth.control.labcomm2014.ASTbuilder;
+//import se.lth.control.labcomm2014.TypeBinding;
import se.lth.control.labcomm2014.compiler.Program;
import java.io.FileOutputStream;
diff --git a/examples/wiki_example/example_decoder_encoder.java b/examples/wiki_example/example_decoder_encoder.java
index 252cc1d..be63094 100644
--- a/examples/wiki_example/example_decoder_encoder.java
+++ b/examples/wiki_example/example_decoder_encoder.java
@@ -4,8 +4,8 @@ import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
-import se.lth.control.labcomm.DecoderChannel;
-import se.lth.control.labcomm.EncoderChannel;
+import se.lth.control.labcomm2014.DecoderChannel;
+import se.lth.control.labcomm2014.EncoderChannel;
public class example_decoder_encoder
implements data.Handler, log_message.Handler
diff --git a/lib/java/Makefile b/lib/java/Makefile
index 27029d5..ec46407 100644
--- a/lib/java/Makefile
+++ b/lib/java/Makefile
@@ -24,12 +24,12 @@ all: labcomm.jar labcomm2014.jar labcomm2006.jar
labcomm.jar: gen/JAVAC
echo $@
cd gen ; jar cf ../$@ \
- se/lth/control/labcomm/*.class \
+ se/lth/control/labcomm2014/*.class \
se/lth/control/labcomm2006/*.class
labcomm2014.jar: gen/JAVAC
echo $@
- cd gen ; jar cf ../$@ se/lth/control/labcomm/*.class
+ cd gen ; jar cf ../$@ se/lth/control/labcomm2014/*.class
labcomm2006.jar: gen/JAVAC
echo $@
@@ -38,10 +38,10 @@ labcomm2006.jar: gen/JAVAC
gen:
mkdir gen
-gen/JAVAC: $(MODULES:%=se/lth/control/labcomm/%.java) \
- $(MODULES:%=se/lth/control/labcomm2006/%.java) \
+gen/JAVAC: $(MODULES:%=se/lth/control/labcomm2006/%.java) \
+ $(MODULES:%=se/lth/control/labcomm2014/%.java) \
Makefile | gen
- javac -cp ../../compiler/labcomm_compiler.jar -d gen \
+ javac -cp ../../compiler/labcomm2014_compiler.jar -d gen \
$(filter %.java, $^)
touch $@
diff --git a/lib/java/se/lth/control/labcomm/SampleType.java b/lib/java/se/lth/control/labcomm/SampleType.java
deleted file mode 100644
index f51ce99..0000000
--- a/lib/java/se/lth/control/labcomm/SampleType.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package se.lth.control.labcomm;
-
-public interface SampleType {
-
-}
diff --git a/lib/java/se/lth/control/labcomm/ASTbuilder.java b/lib/java/se/lth/control/labcomm2014/ASTbuilder.java
similarity index 97%
rename from lib/java/se/lth/control/labcomm/ASTbuilder.java
rename to lib/java/se/lth/control/labcomm2014/ASTbuilder.java
index 73bd171..442afb8 100644
--- a/lib/java/se/lth/control/labcomm/ASTbuilder.java
+++ b/lib/java/se/lth/control/labcomm2014/ASTbuilder.java
@@ -1,4 +1,4 @@
-package se.lth.control.labcomm;
+package se.lth.control.labcomm2014;
import java.util.HashMap;
import java.util.HashSet;
@@ -10,8 +10,8 @@ import java.io.DataInputStream;
import java.io.IOException;
import java.io.EOFException;
-import se.lth.control.labcomm.TypeDef;
-import se.lth.control.labcomm.TypeDefParser;
+import se.lth.control.labcomm2014.TypeDef;
+import se.lth.control.labcomm2014.TypeDefParser;
import se.lth.control.labcomm2014.compiler.LabComm;
import se.lth.control.labcomm2014.compiler.LabCommParser;
diff --git a/lib/java/se/lth/control/labcomm/BuiltinType.java b/lib/java/se/lth/control/labcomm2014/BuiltinType.java
similarity index 59%
rename from lib/java/se/lth/control/labcomm/BuiltinType.java
rename to lib/java/se/lth/control/labcomm2014/BuiltinType.java
index adb8cd0..ab0cec1 100644
--- a/lib/java/se/lth/control/labcomm/BuiltinType.java
+++ b/lib/java/se/lth/control/labcomm2014/BuiltinType.java
@@ -1,4 +1,4 @@
-package se.lth.control.labcomm;
+package se.lth.control.labcomm2014;
public interface BuiltinType extends SampleType{
diff --git a/lib/java/se/lth/control/labcomm/Constant.java b/lib/java/se/lth/control/labcomm2014/Constant.java
similarity index 97%
rename from lib/java/se/lth/control/labcomm/Constant.java
rename to lib/java/se/lth/control/labcomm2014/Constant.java
index e109b30..f46018a 100644
--- a/lib/java/se/lth/control/labcomm/Constant.java
+++ b/lib/java/se/lth/control/labcomm2014/Constant.java
@@ -1,4 +1,4 @@
-package se.lth.control.labcomm;
+package se.lth.control.labcomm2014;
public class Constant {
diff --git a/lib/java/se/lth/control/labcomm/Decoder.java b/lib/java/se/lth/control/labcomm2014/Decoder.java
similarity index 95%
rename from lib/java/se/lth/control/labcomm/Decoder.java
rename to lib/java/se/lth/control/labcomm2014/Decoder.java
index ae68446..52c6636 100644
--- a/lib/java/se/lth/control/labcomm/Decoder.java
+++ b/lib/java/se/lth/control/labcomm2014/Decoder.java
@@ -1,4 +1,4 @@
-package se.lth.control.labcomm;
+package se.lth.control.labcomm2014;
import java.io.IOException;
diff --git a/lib/java/se/lth/control/labcomm/DecoderChannel.java b/lib/java/se/lth/control/labcomm2014/DecoderChannel.java
similarity index 99%
rename from lib/java/se/lth/control/labcomm/DecoderChannel.java
rename to lib/java/se/lth/control/labcomm2014/DecoderChannel.java
index 0538291..0e3ac6e 100644
--- a/lib/java/se/lth/control/labcomm/DecoderChannel.java
+++ b/lib/java/se/lth/control/labcomm2014/DecoderChannel.java
@@ -1,4 +1,4 @@
-package se.lth.control.labcomm;
+package se.lth.control.labcomm2014;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
diff --git a/lib/java/se/lth/control/labcomm/DecoderRegistry.java b/lib/java/se/lth/control/labcomm2014/DecoderRegistry.java
similarity index 99%
rename from lib/java/se/lth/control/labcomm/DecoderRegistry.java
rename to lib/java/se/lth/control/labcomm2014/DecoderRegistry.java
index 79a7806..af264e6 100644
--- a/lib/java/se/lth/control/labcomm/DecoderRegistry.java
+++ b/lib/java/se/lth/control/labcomm2014/DecoderRegistry.java
@@ -1,4 +1,4 @@
-package se.lth.control.labcomm;
+package se.lth.control.labcomm2014;
import java.io.IOException;
import java.util.HashMap;
diff --git a/lib/java/se/lth/control/labcomm/Encoder.java b/lib/java/se/lth/control/labcomm2014/Encoder.java
similarity index 96%
rename from lib/java/se/lth/control/labcomm/Encoder.java
rename to lib/java/se/lth/control/labcomm2014/Encoder.java
index 4190115..78c2e48 100644
--- a/lib/java/se/lth/control/labcomm/Encoder.java
+++ b/lib/java/se/lth/control/labcomm2014/Encoder.java
@@ -1,4 +1,4 @@
-package se.lth.control.labcomm;
+package se.lth.control.labcomm2014;
import java.io.IOException;
diff --git a/lib/java/se/lth/control/labcomm/EncoderChannel.java b/lib/java/se/lth/control/labcomm2014/EncoderChannel.java
similarity index 99%
rename from lib/java/se/lth/control/labcomm/EncoderChannel.java
rename to lib/java/se/lth/control/labcomm2014/EncoderChannel.java
index f429f94..b6c25bb 100644
--- a/lib/java/se/lth/control/labcomm/EncoderChannel.java
+++ b/lib/java/se/lth/control/labcomm2014/EncoderChannel.java
@@ -1,4 +1,4 @@
-package se.lth.control.labcomm;
+package se.lth.control.labcomm2014;
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
diff --git a/lib/java/se/lth/control/labcomm/EncoderRegistry.java b/lib/java/se/lth/control/labcomm2014/EncoderRegistry.java
similarity index 97%
rename from lib/java/se/lth/control/labcomm/EncoderRegistry.java
rename to lib/java/se/lth/control/labcomm2014/EncoderRegistry.java
index f990d18..804ffac 100644
--- a/lib/java/se/lth/control/labcomm/EncoderRegistry.java
+++ b/lib/java/se/lth/control/labcomm2014/EncoderRegistry.java
@@ -1,4 +1,4 @@
-package se.lth.control.labcomm;
+package se.lth.control.labcomm2014;
import java.io.IOException;
import java.util.HashMap;
diff --git a/lib/java/se/lth/control/labcomm/Reader.java b/lib/java/se/lth/control/labcomm2014/Reader.java
similarity index 70%
rename from lib/java/se/lth/control/labcomm/Reader.java
rename to lib/java/se/lth/control/labcomm2014/Reader.java
index 1dd0dac..986a3bc 100644
--- a/lib/java/se/lth/control/labcomm/Reader.java
+++ b/lib/java/se/lth/control/labcomm2014/Reader.java
@@ -1,4 +1,4 @@
-package se.lth.control.labcomm;
+package se.lth.control.labcomm2014;
public interface Reader {
diff --git a/lib/java/se/lth/control/labcomm/Sample.java b/lib/java/se/lth/control/labcomm2014/Sample.java
similarity index 72%
rename from lib/java/se/lth/control/labcomm/Sample.java
rename to lib/java/se/lth/control/labcomm2014/Sample.java
index 2dd432b..6dcf1cf 100644
--- a/lib/java/se/lth/control/labcomm/Sample.java
+++ b/lib/java/se/lth/control/labcomm2014/Sample.java
@@ -1,4 +1,4 @@
-package se.lth.control.labcomm;
+package se.lth.control.labcomm2014;
public interface Sample extends SampleType {
diff --git a/lib/java/se/lth/control/labcomm/SampleDispatcher.java b/lib/java/se/lth/control/labcomm2014/SampleDispatcher.java
similarity index 95%
rename from lib/java/se/lth/control/labcomm/SampleDispatcher.java
rename to lib/java/se/lth/control/labcomm2014/SampleDispatcher.java
index b2ed2fd..0d6b8b4 100644
--- a/lib/java/se/lth/control/labcomm/SampleDispatcher.java
+++ b/lib/java/se/lth/control/labcomm2014/SampleDispatcher.java
@@ -1,4 +1,4 @@
-package se.lth.control.labcomm;
+package se.lth.control.labcomm2014;
import java.io.IOException;
diff --git a/lib/java/se/lth/control/labcomm/SampleHandler.java b/lib/java/se/lth/control/labcomm2014/SampleHandler.java
similarity index 50%
rename from lib/java/se/lth/control/labcomm/SampleHandler.java
rename to lib/java/se/lth/control/labcomm2014/SampleHandler.java
index d03da88..a5f67f8 100644
--- a/lib/java/se/lth/control/labcomm/SampleHandler.java
+++ b/lib/java/se/lth/control/labcomm2014/SampleHandler.java
@@ -1,4 +1,4 @@
-package se.lth.control.labcomm;
+package se.lth.control.labcomm2014;
public interface SampleHandler {
}
diff --git a/lib/java/se/lth/control/labcomm2014/SampleType.java b/lib/java/se/lth/control/labcomm2014/SampleType.java
new file mode 100644
index 0000000..71f9786
--- /dev/null
+++ b/lib/java/se/lth/control/labcomm2014/SampleType.java
@@ -0,0 +1,5 @@
+package se.lth.control.labcomm2014;
+
+public interface SampleType {
+
+}
diff --git a/lib/java/se/lth/control/labcomm/TypeBinding.java b/lib/java/se/lth/control/labcomm2014/TypeBinding.java
similarity index 93%
rename from lib/java/se/lth/control/labcomm/TypeBinding.java
rename to lib/java/se/lth/control/labcomm2014/TypeBinding.java
index 1c0cd41..47b33d5 100644
--- a/lib/java/se/lth/control/labcomm/TypeBinding.java
+++ b/lib/java/se/lth/control/labcomm2014/TypeBinding.java
@@ -1,12 +1,12 @@
-package se.lth.control.labcomm;
+package se.lth.control.labcomm2014;
import java.io.IOException;
import java.io.ByteArrayOutputStream;
import java.io.ByteArrayInputStream;
-import se.lth.control.labcomm.Decoder;
-import se.lth.control.labcomm.DecoderChannel;
-import se.lth.control.labcomm.SampleDispatcher;
-import se.lth.control.labcomm.SampleHandler;
+import se.lth.control.labcomm2014.Decoder;
+import se.lth.control.labcomm2014.DecoderChannel;
+import se.lth.control.labcomm2014.SampleDispatcher;
+import se.lth.control.labcomm2014.SampleHandler;
public class TypeBinding implements BuiltinType {
private int sampleIndex;
diff --git a/lib/java/se/lth/control/labcomm/TypeDef.java b/lib/java/se/lth/control/labcomm2014/TypeDef.java
similarity index 93%
rename from lib/java/se/lth/control/labcomm/TypeDef.java
rename to lib/java/se/lth/control/labcomm2014/TypeDef.java
index 067c400..494365c 100644
--- a/lib/java/se/lth/control/labcomm/TypeDef.java
+++ b/lib/java/se/lth/control/labcomm2014/TypeDef.java
@@ -1,12 +1,12 @@
-package se.lth.control.labcomm;
+package se.lth.control.labcomm2014;
import java.io.IOException;
import java.io.ByteArrayOutputStream;
import java.io.ByteArrayInputStream;
-import se.lth.control.labcomm.Decoder;
-import se.lth.control.labcomm.DecoderChannel;
-import se.lth.control.labcomm.SampleDispatcher;
-import se.lth.control.labcomm.SampleHandler;
+import se.lth.control.labcomm2014.Decoder;
+import se.lth.control.labcomm2014.DecoderChannel;
+import se.lth.control.labcomm2014.SampleDispatcher;
+import se.lth.control.labcomm2014.SampleHandler;
public class TypeDef implements BuiltinType {
private int index;
diff --git a/lib/java/se/lth/control/labcomm/TypeDefParser.java b/lib/java/se/lth/control/labcomm2014/TypeDefParser.java
similarity index 98%
rename from lib/java/se/lth/control/labcomm/TypeDefParser.java
rename to lib/java/se/lth/control/labcomm2014/TypeDefParser.java
index a72e965..4175bbc 100644
--- a/lib/java/se/lth/control/labcomm/TypeDefParser.java
+++ b/lib/java/se/lth/control/labcomm2014/TypeDefParser.java
@@ -1,4 +1,4 @@
-package se.lth.control.labcomm;
+package se.lth.control.labcomm2014;
import java.util.HashMap;
import java.util.HashSet;
@@ -10,10 +10,10 @@ import java.io.DataInputStream;
import java.io.IOException;
import java.io.EOFException;
-import se.lth.control.labcomm.Decoder;
-import se.lth.control.labcomm.DecoderChannel;
-import se.lth.control.labcomm.TypeDef;
-import se.lth.control.labcomm.TypeBinding;
+import se.lth.control.labcomm2014.Decoder;
+import se.lth.control.labcomm2014.DecoderChannel;
+import se.lth.control.labcomm2014.TypeDef;
+import se.lth.control.labcomm2014.TypeBinding;
public class TypeDefParser implements TypeDef.Handler, TypeBinding.Handler {
diff --git a/lib/java/se/lth/control/labcomm/Writer.java b/lib/java/se/lth/control/labcomm2014/Writer.java
similarity index 75%
rename from lib/java/se/lth/control/labcomm/Writer.java
rename to lib/java/se/lth/control/labcomm2014/Writer.java
index 2e015b0..5546882 100644
--- a/lib/java/se/lth/control/labcomm/Writer.java
+++ b/lib/java/se/lth/control/labcomm2014/Writer.java
@@ -1,4 +1,4 @@
-package se.lth.control.labcomm;
+package se.lth.control.labcomm2014;
import java.io.IOException;
diff --git a/lib/java/se/lth/control/labcomm/WriterWrapper.java b/lib/java/se/lth/control/labcomm2014/WriterWrapper.java
similarity index 88%
rename from lib/java/se/lth/control/labcomm/WriterWrapper.java
rename to lib/java/se/lth/control/labcomm2014/WriterWrapper.java
index 7c33137..f8b358d 100644
--- a/lib/java/se/lth/control/labcomm/WriterWrapper.java
+++ b/lib/java/se/lth/control/labcomm2014/WriterWrapper.java
@@ -1,4 +1,4 @@
-package se.lth.control.labcomm;
+package se.lth.control.labcomm2014;
import java.io.OutputStream;
import java.io.IOException;
diff --git a/test/relay_gen_java.py b/test/relay_gen_java.py
index a4a3b88..c522367 100755
--- a/test/relay_gen_java.py
+++ b/test/relay_gen_java.py
@@ -31,9 +31,9 @@ if __name__ == '__main__':
|import java.io.FileInputStream;
|import java.io.FileOutputStream;
|import java.io.IOException;
- |import se.lth.control.labcomm.DecoderChannel;
- |import se.lth.control.labcomm.EncoderChannel;
- |import se.lth.control.labcomm.Sample;
+ |import se.lth.control.labcomm2014.DecoderChannel;
+ |import se.lth.control.labcomm2014.EncoderChannel;
+ |import se.lth.control.labcomm2014.Sample;
|
|public class java_relay implements
"""))
--
GitLab