From bf15b80d2331315063c0eba66f5e3cc18ce267f7 Mon Sep 17 00:00:00 2001 From: Heiko Strathmann Date: Tue, 7 Jun 2016 16:45:37 +0100 Subject: [PATCH] explicit imports; fix problem of ambiguous Math reference --- examples/meta/generator/targets/java.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/examples/meta/generator/targets/java.json b/examples/meta/generator/targets/java.json index 1e39175b69d..8d8300f14cd 100644 --- a/examples/meta/generator/targets/java.json +++ b/examples/meta/generator/targets/java.json @@ -1,9 +1,10 @@ { - "Program": "import org.shogun.*;\nimport org.jblas.*;\n\n${dependencies}class $programName {\nstatic {\nSystem.loadLibrary(\"modshogun\");\n}\n\npublic static void main(String argv[]) {\nmodshogun.init_shogun_with_defaults();\n\n$program$testing\n}\n}\n", + "Program": "import org.jblas.DoubleMatrix;\nimport org.jblas.FloatMatrix;\n\n${dependencies}class $programName {\nstatic {\nSystem.loadLibrary(\"modshogun\");\n}\n\npublic static void main(String argv[]) {\nmodshogun.init_shogun_with_defaults();\n\n$program$testing\n}\n}\n", "Dependencies": { - "AllDependencies": "$enumDependencies\n\n", + "AllDependencies": "$interfacedClassDependencies\n$enumDependencies\n\n", + "InterfacedClassDependencies": "$classlist\n", "EnumDependencies": "$enums", - "DependencyListElementClass": "$element", + "DependencyListElementClass": "import org.shogun.$element;", "DependencyListElementEnum": "import static org.shogun.$type.$value;", "DependencyListSeparator": "\n" }, @@ -16,6 +17,7 @@ "Assign": "$name = $expr", "Type": { "Default": "$type", + "Math": "org.shogun.Math", "bool": "boolean", "int": "int", "float": "float",