From 8bd15f12236a6ce3d65952dbcbfc1d25e7a73e32 Mon Sep 17 00:00:00 2001 From: Christopher Vogt Date: Wed, 28 Sep 2016 20:32:07 -0400 Subject: Use correct main method for Dottydoc - the java interface and work around the fact that the main method is not static (huh?) --- stage1/Stage1Lib.scala | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'stage1/Stage1Lib.scala') diff --git a/stage1/Stage1Lib.scala b/stage1/Stage1Lib.scala index bbb6f7b..c427b77 100644 --- a/stage1/Stage1Lib.scala +++ b/stage1/Stage1Lib.scala @@ -101,13 +101,19 @@ class Stage1Lib( val logger: Logger ) extends BaseLib{ } else ExitCode.Success } - def runMain(cls: String, args: Seq[String], classLoader: ClassLoader ): ExitCode = { + def runMain( cls: String, args: Seq[String], classLoader: ClassLoader, fakeInstance: Boolean = false ): ExitCode = { + import java.lang.reflect.Modifier logger.lib(s"Running $cls.main($args) with classLoader: " ++ classLoader.toString) trapExitCode{ - classLoader - .loadClass(cls) - .getMethod( "main", classOf[Array[String]] ) - .invoke( null, args.toArray.asInstanceOf[AnyRef] ) + val c = classLoader.loadClass(cls) + val m = c.getMethod( "main", classOf[Array[String]] ) + val instance = + if(!fakeInstance) null else c.newInstance + assert( + fakeInstance || (m.getModifiers & java.lang.reflect.Modifier.STATIC) > 0, + "Cannot run non-static method " ++ cls+".main" + ) + m.invoke( instance, args.toArray.asInstanceOf[AnyRef] ) ExitCode.Success } } -- cgit v1.2.3