Commit c2ba658e authored by Anders Blomdell's avatar Anders Blomdell
Browse files

Re-enable user_types test, made dispatcher private again

parent ca3001c5
......@@ -499,7 +499,7 @@ aspect Java_Class {
public void Decl.Java_emitDispatcher(Java_env env, boolean isSample) {
// String genericStr = ""; //env.versionHasMetaData()?"<"+getName()+">":"";
String genericStr = "<"+getName()+">";
env.println("public static final Dispatcher dispatcher = new Dispatcher();");
env.println("private static Dispatcher dispatcher = new Dispatcher();");
env.println();
env.println("public SampleDispatcher getDispatcher() {");
env.indent();
......@@ -507,6 +507,12 @@ aspect Java_Class {
env.unindent();
env.println("}");
env.println();
env.println("public static SampleDispatcher staticGetDispatcher() {");
env.indent();
env.println("return dispatcher;");
env.unindent();
env.println("}");
env.println();
env.println("private static class Dispatcher implements SampleDispatcher "+genericStr+"{");
env.indent();
env.println();
......
SUBDIRS=duck_typing dynamic jgrafchart robot simple tcp \
twoway wiki_example
# user_types # Disabled until typeefs are reimplemented in library
twoway wiki_example user_types
# user_types # Disabled until typedefs are reimplemented in library
.PHONY: all
......@@ -14,11 +14,11 @@ UNAME_S=$(shell uname -s)
test:
echo More to be done...
ifeq ($(UNAME_S),Darwin)
# $(MAKE) -C user_types all
$(MAKE) -C user_types test
else
cd simple ; sh compile.sh && sh run.sh
$(MAKE) -C wiki_example test
# $(MAKE) -C user_types test
$(MAKE) -C user_types test
endif
$(MAKE) -C duck_typing test
$(MAKE) -C twoway test
......
......@@ -31,7 +31,7 @@ public class Encoder
intAndRef iar = new intAndRef();
iar.x = 17;
iar.reference = doavoid.dispatcher;
iar.reference = doavoid.staticGetDispatcher();
System.out.println("Encoding intAndRef");
intAndRef.encode(encoder, iar);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment