[ jEdit-commits ] SF.net SVN: jedit:[14517] plugins/ScriptEnginePlugin/trunk

[<el...@us...>]

Revision: 14517
          http://jedit.svn.sourceforge.net/jedit/?rev=14517&view=rev
Author:   elberry
Date:     2009-01-30 01:18:11 +0000 (Fri, 30 Jan 2009)

Log Message:
-----------
reverting - removing Console and ErrorList support

Modified Paths:
--------------
    plugins/ScriptEnginePlugin/trunk/build.xml
    plugins/ScriptEnginePlugin/trunk/main/resources/ScriptEnginePlugin.props
    plugins/ScriptEnginePlugin/trunk/main/src/java/com/townsfolkdesigns/jedit/plugins/scripting/ScriptEngineDelegate.java
    plugins/ScriptEnginePlugin/trunk/main/src/java/com/townsfolkdesigns/jedit/plugins/scripting/ScriptEnginePlugin.java
    plugins/ScriptEnginePlugin/trunk/main/src/java/com/townsfolkdesigns/jedit/plugins/scripting/ScriptExecutionDelegate.java

Modified: plugins/ScriptEnginePlugin/trunk/build.xml
===================================================================
--- plugins/ScriptEnginePlugin/trunk/build.xml	2009-01-29 23:32:09 UTC (rev 14516)
+++ plugins/ScriptEnginePlugin/trunk/build.xml	2009-01-30 01:18:11 UTC (rev 14517)
@@ -5,7 +5,6 @@
 	<property file="local.build.properties" />
 	<!-- build.properties contains properties that are committable -->
 	<property file="build.properties" />
-	<property file="../build.properties" />
 	
 	<!-- setup the jEdit properties -->
 	<property name="jedit.install.dir" value=".." />

Modified: plugins/ScriptEnginePlugin/trunk/main/resources/ScriptEnginePlugin.props
===================================================================
--- plugins/ScriptEnginePlugin/trunk/main/resources/ScriptEnginePlugin.props	2009-01-29 23:32:09 UTC (rev 14516)
+++ plugins/ScriptEnginePlugin/trunk/main/resources/ScriptEnginePlugin.props	2009-01-30 01:18:11 UTC (rev 14517)
@@ -2,37 +2,27 @@
 plugin.com.townsfolkdesigns.jedit.plugins.scripting.ScriptEnginePlugin.author=Eric Berry
 plugin.com.townsfolkdesigns.jedit.plugins.scripting.ScriptEnginePlugin.depend.0=jdk 1.5
 plugin.com.townsfolkdesigns.jedit.plugins.scripting.ScriptEnginePlugin.depend.1=jedit 04.03.15.00
-plugin.com.townsfolkdesigns.jedit.plugins.scripting.ScriptEnginePlugin.depend.2=plugin errorlist.ErrorListPlugin 1.7
-plugin.com.townsfolkdesigns.jedit.plugins.scripting.ScriptEnginePlugin.depend.3=optional plugin console.ConsolePlugin 4.3.8
 plugin.com.townsfolkdesigns.jedit.plugins.scripting.ScriptEnginePlugin.description=Provides a framework to make JSR223/scripting.dev.java.net scripting engines usable within jEdit.
 plugin.com.townsfolkdesigns.jedit.plugins.scripting.ScriptEnginePlugin.docs=/docs/ScriptEnginePlugin.html
 plugin.com.townsfolkdesigns.jedit.plugins.scripting.ScriptEnginePlugin.jars=script-api.jar
 plugin.com.townsfolkdesigns.jedit.plugins.scripting.ScriptEnginePlugin.name=Script Engine Plugin
-plugin.com.townsfolkdesigns.jedit.plugins.scripting.ScriptEnginePlugin.version=0.5.1
+plugin.com.townsfolkdesigns.jedit.plugins.scripting.ScriptEnginePlugin.version=0.5.0
 
-# can use this one after console support is added.
-#plugin.com.townsfolkdesigns.jedit.plugins.scripting.ScriptEnginePlugin.menu= \
-#	scriptengine.plugin.evaluate.buffer \
-#	scriptengine.plugin.evaluate.buffer.to.console \
-#	- \
-#	scriptengine.plugin.evaluate.selection \
-#	scriptengine.plugin.evaluate.selection.to.console \
-#	- \
-#	scriptengine.plugin.macro.create \
-#	scriptengine.plugin.macro.create.from.buffer
-	
 plugin.com.townsfolkdesigns.jedit.plugins.scripting.ScriptEnginePlugin.menu= \
 	scriptengine.plugin.evaluate.buffer \
+	scriptengine.plugin.evaluate.buffer.to.console \
+	- \
 	scriptengine.plugin.evaluate.selection \
+	scriptengine.plugin.evaluate.selection.to.console \
 	- \
 	scriptengine.plugin.macro.create \
 	scriptengine.plugin.macro.create.from.buffer
 
 # Menu Labels.
 scriptengine.plugin.evaluate.buffer.label=Evaluate Buffer
-scriptengine.plugin.evaluate.buffer.to.console.label=Buffer to Console
+scriptengine.plugin.evaluate.buffer.to.console.label=-   in Console
 scriptengine.plugin.evaluate.selection.label=Evaluate Selection
-scriptengine.plugin.evaluate.selection.to.console.label=Selection to Console
+scriptengine.plugin.evaluate.selection.to.console.label=-   in Console
 scriptengine.plugin.macro.create.label=Create Macro
 scriptengine.plugin.macro.create.from.buffer.label=Create Macro from Buffer
 scriptengine.plugin.menu.label=Scripting

Modified: plugins/ScriptEnginePlugin/trunk/main/src/java/com/townsfolkdesigns/jedit/plugins/scripting/ScriptEngineDelegate.java
===================================================================
--- plugins/ScriptEnginePlugin/trunk/main/src/java/com/townsfolkdesigns/jedit/plugins/scripting/ScriptEngineDelegate.java	2009-01-29 23:32:09 UTC (rev 14516)
+++ plugins/ScriptEnginePlugin/trunk/main/src/java/com/townsfolkdesigns/jedit/plugins/scripting/ScriptEngineDelegate.java	2009-01-30 01:18:11 UTC (rev 14517)
@@ -34,7 +34,6 @@
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineFactory;
 import javax.script.ScriptEngineManager;
-import javax.script.Compilable;
 
 
 /**
@@ -120,12 +119,10 @@
             // Use the Mode as the ScriptEngine name for consistency. Some engine's are named not for their languages.
             // EG. The Javascript Engine used, is called "Mozilla Rhino" and not "javascript".
             manager.registerEngineName(serviceMode.getName(), factory);
-				
-				ScriptEngine engine = manager.getEngineByName(serviceMode.getName());
 
             Log.log(Log.DEBUG, ScriptEngineDelegate.class,
                "\"" + serviceMode.getName() + "\" ScriptEngine is registered: " +
-               (engine != null) + " | engine supports compiling: " + (engine instanceof Compilable));
+               (manager.getEngineByName(serviceMode.getName()) != null));
 
 
          } catch (Exception e) {

Modified: plugins/ScriptEnginePlugin/trunk/main/src/java/com/townsfolkdesigns/jedit/plugins/scripting/ScriptEnginePlugin.java
===================================================================
--- plugins/ScriptEnginePlugin/trunk/main/src/java/com/townsfolkdesigns/jedit/plugins/scripting/ScriptEnginePlugin.java	2009-01-29 23:32:09 UTC (rev 14516)
+++ plugins/ScriptEnginePlugin/trunk/main/src/java/com/townsfolkdesigns/jedit/plugins/scripting/ScriptEnginePlugin.java	2009-01-30 01:18:11 UTC (rev 14517)
@@ -23,8 +23,6 @@
 
 
 import org.gjt.sp.jedit.EditPlugin;
-import errorlist.DefaultErrorSource;
-import errorlist.ErrorSource;
 
 
 /**
@@ -38,7 +36,6 @@
    private MacroDelegate macroDelegate;
    private ScriptEngineDelegate scriptEngineDelegate;
    private ScriptExecutionDelegate scriptExecutionDelegate;
-	private ErrorSource errorSource;
 
    public ScriptEnginePlugin() {
       scriptEngineDelegate = new ScriptEngineDelegate();
@@ -73,13 +70,9 @@
 
    @Override
    public void start() {
-		errorSource = new DefaultErrorSource("ScriptEnginePlugin");
-		scriptExecutionDelegate.setErrorSource(errorSource);
-		ErrorSource.registerErrorSource(errorSource);
    }
 
    @Override
    public void stop() {
-		ErrorSource.unregisterErrorSource(errorSource);
    }
 }

Modified: plugins/ScriptEnginePlugin/trunk/main/src/java/com/townsfolkdesigns/jedit/plugins/scripting/ScriptExecutionDelegate.java
===================================================================
--- plugins/ScriptEnginePlugin/trunk/main/src/java/com/townsfolkdesigns/jedit/plugins/scripting/ScriptExecutionDelegate.java	2009-01-29 23:32:09 UTC (rev 14516)
+++ plugins/ScriptEnginePlugin/trunk/main/src/java/com/townsfolkdesigns/jedit/plugins/scripting/ScriptExecutionDelegate.java	2009-01-30 01:18:11 UTC (rev 14517)
@@ -32,13 +32,8 @@
 
 import javax.script.ScriptContext;
 import javax.script.ScriptEngine;
-import javax.script.ScriptException;
 
-import errorlist.ErrorSource;
-import errorlist.DefaultErrorSource;
 
-
-
 /**
  *
  * @author elberry
@@ -46,7 +41,6 @@
 public class ScriptExecutionDelegate {
 
    private ScriptEngineDelegate scriptEngineManager;
-	private ErrorSource errorSource;
 
    public ScriptExecutionDelegate() {
       this(new ScriptEngineDelegate());
@@ -60,28 +54,16 @@
       String bufferText = view.getTextArea().getText();
       Mode bufferMode = view.getBuffer().getMode();
       ScriptContext scriptContext = ScriptEngineUtilities.getDefaultScriptContext(view);
-		Object returnVal = evaluateString(bufferText, bufferMode.getName(), scriptContext);
-		if(returnVal instanceof DefaultErrorSource.DefaultError) {
-			DefaultErrorSource.DefaultError error = (DefaultErrorSource.DefaultError)returnVal;
-			returnVal = null;
-			error.setFilePath(view.getBuffer().getPath());
-			errorSource.addError(error);
-		}
-		return returnVal;
+
+      return evaluateString(bufferText, bufferMode.getName(), scriptContext);
    }
 
    public Object evaluateSelection(View view) {
       String bufferText = view.getTextArea().getSelectedText();
       Mode bufferMode = view.getBuffer().getMode();
       ScriptContext scriptContext = ScriptEngineUtilities.getDefaultScriptContext(view);
-		Object returnVal = evaluateString(bufferText, bufferMode.getName(), scriptContext);
-		if(returnVal instanceof DefaultErrorSource.DefaultError) {
-			DefaultErrorSource.DefaultError error = (DefaultErrorSource.DefaultError)returnVal;
-			returnVal = null;
-			error.setFilePath(view.getBuffer().getPath());
-			errorSource.addError(error);
-		}
-		return returnVal;
+
+      return evaluateString(bufferText, bufferMode.getName(), scriptContext);
    }
 
    public Object evaluateString(String script, String engineName, ScriptContext scriptContext) {
@@ -103,10 +85,7 @@
             }
 
             Log.log(Log.DEBUG, ScriptExecutionDelegate.class, "Script executed - return val: " + returnVal);
-         } catch (ScriptException e) {
-				Log.log(Log.ERROR, ScriptExecutionDelegate.class, "Error executing script - content: \n" + script, e);
-				returnVal = new DefaultErrorSource.DefaultError(errorSource, ErrorSource.ERROR, "", e.getLineNumber(), e.getColumnNumber(), 1, e.getMessage());
-			} catch (Exception e) {
+         } catch (Exception e) {
             Log.log(Log.ERROR, ScriptExecutionDelegate.class, "Error executing script - content: \n" + script, e);
          }
       } else {
@@ -123,12 +102,4 @@
    public void setScriptEngineManager(ScriptEngineDelegate scriptEngineManager) {
       this.scriptEngineManager = scriptEngineManager;
    }
-	
-	public ErrorSource getErrorSource() {
-		return errorSource;
-	}
-	
-	public void setErrorSource(ErrorSource errorSource) {
-		this.errorSource = errorSource;
-	}
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.