/ - Diff - gvSIG scripting - gvSIG

                     <artifactId>tika-core</artifactId>
                     <version>1.12</version>
                 </dependency>
                 <!-- Eliminar para org.gvsig.desktop > 2.0.115 -->
                 <!--
                 <dependency>
                     <groupId>org.jopendocument</groupId>
                     <artifactId>jOpenDocument</artifactId>
                     <version>1.3</version>
                 </dependency>
                 -->
                 <dependency>
                     <groupId>net.sf.cssbox</groupId>
                     <artifactId>swingbox</artifactId>
                     <version>1.1</version>

         @Override
         public URL getResource(String name) {
             // Para acceder a esto desde python
             // import sys
             // print sys.getClassLoader().getResource("pylint/utils$py.class")
             URL x = super.getResource(name);
             if( needRecompile(name, x) ) {
                 logger.trace("getResoure("+name+") -> null (need recompile).");

             return true;
+        }
         @Override
         public List<String> getNames() {
             ScriptEngine theEngine = this.getEngine();
             if( theEngine instanceof MyPyScriptEngine ) {
                 return ((MyPyScriptEngine) theEngine).getLocalNames();
+            }
             return null;
+        }
+    }

     import java.beans.PropertyChangeListener;
     import java.io.File;
     import java.io.IOException;
     import java.net.URI;
     import java.net.MalformedURLException;
     import java.net.URL;
     import java.util.ArrayList;
     import java.util.HashMap;
     import java.util.HashSet;
-...
     public abstract class AbstractUnit implements ScriptingUnit, Unit {
         protected static final Logger logger = LoggerFactory.getLogger(AbstractUnit.class);
         protected static final Logger LOGGER = LoggerFactory.getLogger(AbstractUnit.class);
         protected DefaultScriptingManager manager;
-...
                         listener.propertyChange(event);
+                    }
                 } catch(Exception ex) {
                     logger.warn("Problems firing PropertyChangeListener to listener "+listener+".",ex);
                     LOGGER.warn("Problems firing PropertyChangeListener to listener "+listener+".",ex);
+                }
+            }
+        }
-...
                 File f = prefs.getFile();
                 String fname = (f == null) ? "(null)" : f.getAbsolutePath();
                 String msg = "Can't save inf file '" + fname + "'.";
                 logger.warn(msg);
                 LOGGER.warn(msg);
                 throw new RuntimeException(msg, e);
+            }
-...
             if (!this.getTypeName().equalsIgnoreCase(typename)) {
                 File f = prefs.getFile();
                 String fname = (f == null) ? "(null)" : f.getAbsolutePath();
                 logger.warn("inconsistent type in inf file '" + fname + "'. Curent type '" + this.getTypeName() + "', type from inf file '" + typename + "'.");
                 LOGGER.warn("inconsistent type in inf file '" + fname + "'. Curent type '" + this.getTypeName() + "', type from inf file '" + typename + "'.");
+            }
             this.setName(getInfString(prefs, "Unit", "name", this.getName()));
             this.setDescription(getInfString(prefs, "Unit", "description", null));
-...
+        }
         protected void console_println(String s) {
             logger.info(s);
             LOGGER.info(s);
+        }
         public void create(ScriptingFolder folder, String id) {
-...
             try {
                 file.createNewFile();
             } catch (IOException e) {
                 logger.warn("Can't create inf file in '" + file.getAbsolutePath() + "'.", e);
                 LOGGER.warn("Can't create inf file in '" + file.getAbsolutePath() + "'.", e);
+            }
+        }
-...
             return new File(getParent().getFile(), this.getId() + ".inf");
+        }
         public URI getURI() {
         public URL getURL() {
             File f = this.getFile();
             return f.toURI();
             try {
                 return f.toURI().toURL();
             } catch (MalformedURLException ex) {
                 return null;
+            }
+        }
         @Override

org.gvsig.scripting/trunk/org.gvsig.scripting/org.gvsig.scripting.lib/org.gvsig.scripting.lib.impl/src/main/java/org/gvsig/scripting/impl/DefaultScriptingExternalFile.java
38	38	try {
39	39	file.createNewFile();
40	40	} catch (IOException e) {
41		logger.warn("Can't create inf file in '" + file.getAbsolutePath() + "'.", e);
	41	LOGGER.warn("Can't create inf file in '" + file.getAbsolutePath() + "'.", e);
42	42	}
43	43	}
44	44

org.gvsig.scripting/trunk/org.gvsig.scripting/org.gvsig.scripting.lib/org.gvsig.scripting.lib.impl/src/main/java/org/python/jsr223/MyPyScriptEngine.java
5	5	import java.io.Reader;
6	6	import java.lang.reflect.InvocationHandler;
7	7	import java.lang.reflect.Proxy;
	8	import java.util.List;
8	9	import javax.script.AbstractScriptEngine;
9	10	import javax.script.Bindings;
10	11	import javax.script.Compilable;
...	...
32	33	return this.interp;
33	34	}
34	35
	36	@Override
35	37	public Object eval(String script, ScriptContext context) throws ScriptException {
36	38	return eval(compileScript(script, context), context);
37	39	}
...	...
48	50	}
49	51	}
50	52
	53	@Override
51	54	public Object eval(Reader reader, ScriptContext context) throws ScriptException {
52	55	return eval(compileScript(reader, context), context);
53	56	}
54	57
	58	@Override
55	59	public Bindings createBindings() {
56	60	return new SimpleBindings();
57	61	}
58	62
	63	@Override
59	64	public ScriptEngineFactory getFactory() {
60	65	return factory;
61	66	}
62	67
	68	@Override
63	69	public CompiledScript compile(String script) throws ScriptException {
64	70	return new PyCompiledScript(compileScript(script, context));
65	71	}
66	72
	73	@Override
67	74	public CompiledScript compile(Reader reader) throws ScriptException {
68	75	return new PyCompiledScript(compileScript(reader, context));
69	76	}
...	...
94	101	}
95	102	}
96	103
	104	@Override
97	105	public Object invokeMethod(Object thiz, String name, Object... args) throws ScriptException,
98	106	NoSuchMethodException {
99	107	try {
...	...
143	151	}
144	152	}
145	153
	154	@Override
146	155	public <T> T getInterface(Class<T> clazz) {
147	156	return getInterface(new PyModule("__jsr223__", interp.getLocals()), clazz);
148	157	}
149	158
	159	@Override
150	160	public <T> T getInterface(Object obj, Class<T> clazz) {
151	161	if (obj == null) {
152	162	throw new IllegalArgumentException("object expected");
...	...
161	171	clazz.getClassLoader(),
162	172	new Class[] { clazz },
163	173	new InvocationHandler() {
	174	@Override
164	175	public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
165	176	try {
166	177	interp.setLocals(new PyScriptEngineScope(MyPyScriptEngine.this, context));
...	...
183	194	}
184	195
185	196	private static ScriptException scriptException(PyException pye) {
186		ScriptException se = null;
	197	ScriptException se;
187	198	try {
188	199	pye.normalize();
189	200
...	...
225	236	}
226	237
227	238	private class PyCompiledScript extends CompiledScript {
228		private PyCode code;
	239	private final PyCode code;
229	240
230	241	PyCompiledScript(PyCode code) {
231	242	this.code = code;
...	...
240	251	public Object eval(ScriptContext ctx) throws ScriptException {
241	252	return MyPyScriptEngine.this.eval(code, ctx);
242	253	}
	254
243	255	}
244	256
	257	@Override
245	258	public void close() {
246	259	interp.close();
247	260	}
	261
	262	public List<String> getLocalNames() {
	263	PyScriptEngineScope locals = (PyScriptEngineScope) interp.getLocals();
	264	PyList names = (PyList) locals.scope_keys();
	265	return names;
	266	}
	267
248	268	}

Application: gvSIG desktop » gvSIG scripting

Revision 1112