Changeset 131:aaa7df04ed1c

Timestamp:

07/31/2008 10:05:39 PM (5 months ago)

Author:

marc@f1.local

branch:

default

Message:

Scala and Processing are no longer enabled by default. Added new 'shim' for variables that are bridged from Python to the ScalaInterface?

Files:

• distribution/application/extensions/processingPlugin.mf (deleted)
• distribution/application/extensions/scalaPlugin.mf (deleted)
• extras/fieldscala/field/core/execution/ScalaInterface.java (modified) (3 diffs)

extras/fieldscala/field/core/execution/ScalaInterface.java

@@ -77 +77 @@
-                        try {
-                                scalaInterface.eval("trait Shim[T]\n" + "{\n" + "       def get: T\n" + "       def set(t : T)\n" + "}\n" + "\n" + "implicit def deShim[T](g : Shim[T]) : T = \n" + "   g.get\n", false);
+                                scalaInterface.eval("class PythonShim[T](name : String) extends Shim[T]\n" + "{\n" + "  import field.core.execution.PythonInterface\n" + "      def get : T = \n" + "           PythonInterface.getPythonInterface().getVariable(name).asInstanceOf[T]\n" + "   def set(t : T) = \n" + "                PythonInterface.getPythonInterface().setVariable(name, t)\n" + "}", false);
-                        } finally {
-                                scalaInterface.insideShared = false;
@@ -282 +283 @@
-
-                        // temp workaround for bug #70
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        for (ScriptingInterface s : shared)
-                                s.setVariable(name, value);
@@ -294 +310 @@
-                                // we need to build a Shim ÑÊwhat should this
-                                // shim be called ?
+
+                                eval("var "+name+"_ = new PythonShim["+typeName+"](\""+name+"\")", false);
-
-                        }