diff options
Diffstat (limited to 'configgen/src/main/java/com/yahoo/config/codegen/MakeConfig.java')
-rw-r--r-- | configgen/src/main/java/com/yahoo/config/codegen/MakeConfig.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/configgen/src/main/java/com/yahoo/config/codegen/MakeConfig.java b/configgen/src/main/java/com/yahoo/config/codegen/MakeConfig.java index b2c19f26b5f..91d401c91b7 100644 --- a/configgen/src/main/java/com/yahoo/config/codegen/MakeConfig.java +++ b/configgen/src/main/java/com/yahoo/config/codegen/MakeConfig.java @@ -14,27 +14,26 @@ public class MakeConfig { private final ClassBuilder classBuilder; - public MakeConfig(InnerCNode root, NormalizedDefinition nd, String path, MakeConfigProperties properties) { - classBuilder = createClassBuilder(root, nd, path, properties); + public MakeConfig(InnerCNode root, NormalizedDefinition nd, MakeConfigProperties properties) { + classBuilder = createClassBuilder(root, nd, properties); } - public static ClassBuilder createClassBuilder(InnerCNode root, NormalizedDefinition nd, String path, MakeConfigProperties prop) { + public static ClassBuilder createClassBuilder(InnerCNode root, NormalizedDefinition nd, MakeConfigProperties prop) { if (prop.language.equals("cppng") || prop.language.equals("cpp")) return new CppClassBuilder(root, nd, prop.destDir, prop.dirInRoot); else - return new JavaClassBuilder(root, nd, prop.destDir); + return new JavaClassBuilder(root, nd, prop.destDir, prop.javaPackagePrefix); } public static boolean makeConfig(MakeConfigProperties properties) throws FileNotFoundException { for (File specFile : properties.specFiles) { - String path = specFile.toURI().toString(); String name = specFile.getName(); if (name.endsWith(".def")) name = name.substring(0, name.length() - 4); DefParser parser = new DefParser(name, new FileReader(specFile)); InnerCNode configRoot = parser.getTree(); checkNamespace(name, configRoot); if (configRoot != null) { - MakeConfig mc = new MakeConfig(configRoot, parser.getNormalizedDefinition(), path, properties); + MakeConfig mc = new MakeConfig(configRoot, parser.getNormalizedDefinition(), properties); mc.buildClasses(); if (properties.dumpTree) { System.out.println("\nTree dump:"); |