The Contiki Operating System

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "contiki".

The branch, master has been updated
       via  5c2ecd1def46764eec87a339e87f11aa22f69964 (commit)
      from  afcc7559a5c33625607523603b395745034a3e47 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5c2ecd1def46764eec87a339e87f11aa22f69964
Author: Fredrik Osterlind <fros@...>
Date:   Tue Jun 5 13:39:21 2012 +0200

    improved workaround to disable the code editor pane's built in run functionality: remove keyboard shortcut instead of
    disabling action

diff --git a/tools/cooja/java/se/sics/cooja/plugins/ScriptRunner.java b/tools/cooja/java/se/sics/cooja/plugins/ScriptRunner.java
index f7db90b..96dc544 100644
--- a/tools/cooja/java/se/sics/cooja/plugins/ScriptRunner.java
+++ b/tools/cooja/java/se/sics/cooja/plugins/ScriptRunner.java
@@ -75,7 +75,6 @@ import javax.swing.filechooser.FileFilter;
 
 import jsyntaxpane.DefaultSyntaxKit;
 import jsyntaxpane.actions.DefaultSyntaxAction;
-import jsyntaxpane.actions.ScriptRunnerAction;
 
 import org.apache.log4j.Logger;
 import org.jdom.Element;
@@ -169,6 +168,7 @@ public class ScriptRunner extends VisPlugin {
         DefaultSyntaxKit kit = (DefaultSyntaxKit) e.getEditorKit();
         kit.setProperty("PopupMenu", "copy-to-clipboard,-,find,find-next,goto-line,-,linkfile");
         kit.setProperty("Action.linkfile", JSyntaxLinkFile.class.getName());
+        kit.setProperty("Action.execute-script", "jsyntaxpane.actions.ScriptRunnerAction");
       }
     }
 
@@ -229,6 +229,7 @@ public class ScriptRunner extends VisPlugin {
       DefaultSyntaxKit kit = (DefaultSyntaxKit) codeEditor.getEditorKit();
       kit.setProperty("PopupMenu", "copy-to-clipboard,-,find,find-next,goto-line,-,linkfile");
       kit.setProperty("Action.linkfile", JSyntaxLinkFile.class.getName());
+      kit.setProperty("Action.execute-script", "jsyntaxpane.actions.ScriptRunnerAction");
     }
 
     JPopupMenu p = codeEditor.getComponentPopupMenu();
@@ -242,13 +243,9 @@ public class ScriptRunner extends VisPlugin {
         }
         Action a = ((JMenuItem) c).getAction();
         if (a instanceof JSyntaxLinkFile) {
-          actionLinkFile = (JSyntaxLinkFile)(((JMenuItem) c).getAction());
+          actionLinkFile = (JSyntaxLinkFile) a;
           actionLinkFile.setMenuText("Link script to disk file");
           actionLinkFile.putValue("ScriptRunner", this);
-        } else if (a instanceof ScriptRunnerAction) {
-          /* XXX Disable run action */
-          ScriptRunnerAction sra = (ScriptRunnerAction) ((JMenuItem) c).getAction();
-          sra.setEnabled(false);
         }
       }
     }

-----------------------------------------------------------------------

Summary of changes:
 .../java/se/sics/cooja/plugins/ScriptRunner.java   |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
contiki