[ff-cvs] fenfire/org/fenfire/util JythonMain.java

[Tuukka Hastrup]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Tuukka Hastrup <address@hidden> 03/08/28 07:40:50

Modified files:
        org/fenfire/util: JythonMain.java 

Log message:
        split method importModule for specific app wrappers

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/JythonMain.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/util/JythonMain.java
diff -u fenfire/org/fenfire/util/JythonMain.java:1.1 
fenfire/org/fenfire/util/JythonMain.java:1.2
--- fenfire/org/fenfire/util/JythonMain.java:1.1        Thu Aug 28 06:39:08 2003
+++ fenfire/org/fenfire/util/JythonMain.java    Thu Aug 28 07:40:50 2003
@@ -40,16 +40,21 @@
                               " as an argument.");
            System.exit(5);
        }
-       String[] pyargs = new String[args.length];
-       System.arraycopy(args, 1, pyargs, 1, args.length-1);
-       pyargs[0] = args[0]+".py"; // sys.argv[0] is the command name
+       importModule(args[0], args, 1);
+        // interp.exec("Gzz.run()");
+    }
+
+    public static void importModule(String module, String[] args, int startarg)
+       throws PyException {
+       String[] pyargs = new String[args.length-startarg+1];
+       System.arraycopy(args, startarg, pyargs, 1, args.length-startarg);
+       pyargs[0] = module+".py"; // sys.argv[0] is the command name
        // Python search path will be the same as Java classpath
        System.setProperty("python.path", 
                           System.getProperty("java.class.path"));
        PythonInterpreter.initialize(System.getProperties(), null, pyargs);
        PythonInterpreter interp = new PythonInterpreter();
        // XXX __name__ is not __main__
-       interp.exec("import "+args[0]);
-        // interp.exec("Gzz.run()");
+       interp.exec("import "+module);  
     }
 }