From e9735e391dba61b267ab8ab01d03ec6102577eb6 Mon Sep 17 00:00:00 2001
From: Anders Blomdell <anders.blomdell@control.lth.se>
Date: Tue, 14 Oct 2014 19:26:17 +0200
Subject: [PATCH] More Java renames.
---
compiler/Java_CodeGen.jrag | 4 ++--
lib/java/Makefile | 2 +-
.../se/lth/control/labcomm/{Type.java => SampleType.java} | 4 ++--
.../se/lth/control/labcomm2006/{Type.java => SampleType.java} | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
rename lib/java/se/lth/control/labcomm/{Type.java => SampleType.java} (51%)
rename lib/java/se/lth/control/labcomm2006/{Type.java => SampleType.java} (54%)
diff --git a/compiler/Java_CodeGen.jrag b/compiler/Java_CodeGen.jrag
index 389b0e5..c21260b 100644
--- a/compiler/Java_CodeGen.jrag
+++ b/compiler/Java_CodeGen.jrag
@@ -278,11 +278,11 @@ aspect Java_Class {
}
env.println("import java.io.IOException;");
- env.println("import se.lth.control.labcomm"+env.verStr+".Type;");
+ env.println("import se.lth.control.labcomm"+env.verStr+".SampleType;");
env.println("import se.lth.control.labcomm"+env.verStr+".Encoder;");
env.println("import se.lth.control.labcomm"+env.verStr+".Decoder;");
env.println();
- env.println("public class " + getName() + " implements Type {");
+ env.println("public class " + getName() + " implements SampleType {");
env.println();
env.indent();
getType().Java_emitInstance(env);
diff --git a/lib/java/Makefile b/lib/java/Makefile
index 47b112c..58ee268 100644
--- a/lib/java/Makefile
+++ b/lib/java/Makefile
@@ -9,7 +9,7 @@ MODULES=Constant \
Sample \
SampleDispatcher \
SampleHandler \
- Type \
+ SampleType \
Writer \
WriterWrapper
diff --git a/lib/java/se/lth/control/labcomm/Type.java b/lib/java/se/lth/control/labcomm/SampleType.java
similarity index 51%
rename from lib/java/se/lth/control/labcomm/Type.java
rename to lib/java/se/lth/control/labcomm/SampleType.java
index 46a5507..f51ce99 100644
--- a/lib/java/se/lth/control/labcomm/Type.java
+++ b/lib/java/se/lth/control/labcomm/SampleType.java
@@ -1,5 +1,5 @@
package se.lth.control.labcomm;
-public interface Type {
+public interface SampleType {
-}
\ No newline at end of file
+}
diff --git a/lib/java/se/lth/control/labcomm2006/Type.java b/lib/java/se/lth/control/labcomm2006/SampleType.java
similarity index 54%
rename from lib/java/se/lth/control/labcomm2006/Type.java
rename to lib/java/se/lth/control/labcomm2006/SampleType.java
index 63646a0..932d0d9 100644
--- a/lib/java/se/lth/control/labcomm2006/Type.java
+++ b/lib/java/se/lth/control/labcomm2006/SampleType.java
@@ -1,5 +1,5 @@
package se.lth.control.labcomm2006;
-public interface Type {
+public interface SampleType {
-}
\ No newline at end of file
+}
--
GitLab