From 160821f07742fd3325a5903892f30354ea9d0dd2 Mon Sep 17 00:00:00 2001
From: Brendan Robert <brendan.robert@gmail.com>
Date: Thu, 3 Apr 2014 23:19:59 -0500
Subject: [PATCH 1/3] Additional working fixes to blockly integration, the
 marshalling/unmarshalling of blockly script code is starting to function!

---
 .../badvision/outlaweditor/MythosEditor.java  | 59 +++++++++++++------
 .../MythosScriptEditorController.java         | 27 +++++++++
 .../org/badvision/outlaweditor/UIAction.java  |  6 ++
 .../outlaweditor/data/TileUtils.java          | 28 +++++----
 .../src/main/resources/ApplicationUI.fxml     | 26 ++++----
 .../main/resources/MythosScriptEditor.fxml    | 17 +++---
 .../jaxb/OutlawSchema/OutlawSchema.xsd        | 14 ++---
 .../mythos/mythos-editor/html/editor.html     |  2 +-
 .../main/resources/testData/blocklytest1.xml  |  4 +-
 .../main/resources/testData/blocklytest2.xml  | 23 +++++++-
 .../outlaweditor/test/TestMythosEditor.java   | 10 ++--
 11 files changed, 144 insertions(+), 72 deletions(-)

diff --git a/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosEditor.java b/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosEditor.java
index 421ead44..24d1388c 100644
--- a/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosEditor.java
+++ b/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosEditor.java
@@ -1,7 +1,6 @@
 package org.badvision.outlaweditor;
 
-import java.io.BufferedOutputStream;
-import java.io.BufferedWriter;
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.StringReader;
 import java.io.StringWriter;
@@ -14,22 +13,34 @@ import javafx.scene.layout.AnchorPane;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
 import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBElement;
 import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
 import org.badvision.outlaweditor.data.xml.Block;
 import org.badvision.outlaweditor.data.xml.Script;
+import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
 
 /**
  * Mythos Scripting Editor
+ *
  * @author blurry
  */
 public class MythosEditor {
+
     Script script;
     Stage primaryStage;
     MythosScriptEditorController controller;
+    public static final String XML_HEADER = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n";
+
     public MythosEditor(Script theScript) {
         script = theScript;
     }
-    
+
     public void show() {
         primaryStage = new Stage();
         javafx.application.Platform.setImplicitExit(true);
@@ -45,7 +56,7 @@ public class MythosEditor {
         } catch (IOException exception) {
             throw new RuntimeException(exception);
         }
-        
+
         primaryStage.setOnCloseRequest(new EventHandler<WindowEvent>() {
             @Override
             public void handle(final WindowEvent t) {
@@ -53,9 +64,14 @@ public class MythosEditor {
             }
         });
         primaryStage.show();
-        loadScript();
+        controller.onLoad(new Runnable() {
+            @Override
+            public void run() {
+                loadScript();
+            }
+        });
     }
-    
+
     public void close() {
         primaryStage.close();
     }
@@ -63,15 +79,21 @@ public class MythosEditor {
     public void applyChanges() {
         try {
             String xml = String.valueOf(controller.editorView.getEngine().executeScript("Blockly.Xml.workspaceToDom(Blockly.mainWorkspace).outerHTML"));
-            JAXBContext context = JAXBContext.newInstance(Block.class);
-            Block scriptBlock = (Block) context.createUnmarshaller().unmarshal(new StringReader(xml));
-            script.setBlock(scriptBlock);
-        } catch (JAXBException ex) {
+            xml = xml.replace("<xml>", "");
+            xml = xml.replace("</xml>", "");
+            JAXBContext context = JAXBContext.newInstance("org.badvision.outlaweditor.data.xml");
+            Unmarshaller unmarshaller = context.createUnmarshaller();
+            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+            dbf.setNamespaceAware(true);
+            DocumentBuilder db = dbf.newDocumentBuilder();
+            Document doc = db.parse(new ByteArrayInputStream(xml.getBytes("UTF-8")));
+            JAXBElement<Block> b = unmarshaller.unmarshal(doc, Block.class);
+            script.setBlock(b.getValue());
+        } catch (JAXBException | ParserConfigurationException | SAXException | IOException ex) {
             Logger.getLogger(MythosEditor.class.getName()).log(Level.SEVERE, null, ex);
         }
-        
     }
-    
+
     public void loadScript() {
         if (script == null || script.getBlock() == null) {
             loadScript(createDefaultScript());
@@ -87,15 +109,16 @@ public class MythosEditor {
             Logger.getLogger(MythosEditor.class.getName()).log(Level.SEVERE, null, ex);
         }
     }
-    
+
     public void loadScript(String xml) {
-        xml = xml.replaceAll("\"","\\\"");
-        String loadScript = "var xml = Blockly.Xml.textToDom("+xml+");";
-        loadScript += "Blockly.Xml.domToWorkspace(Blockly.mainWorkspace, xml);";
-        controller.editorView.getEngine().executeScript(loadScript);        
+        xml = XML_HEADER + xml;
+        xml = xml.replaceAll("'", "\\'");
+        xml = xml.replaceAll("\n", "");
+        String loadScript = "Blockly.Xml.domToWorkspace(Blockly.mainWorkspace, Blockly.Xml.textToDom('" + xml + "'));";
+        controller.editorView.getEngine().executeScript(loadScript);
     }
 
     private String createDefaultScript() {
-        return "<block/>";
+        return "<xml><block type=\"procedures_defreturn\" id=\"1\" inline=\"false\" x=\"5\" y=\"5\"><mutation></mutation><field name=\"NAME\">New function</field></block></xml>";
     }
 }
diff --git a/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosScriptEditorController.java b/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosScriptEditorController.java
index f9fc711e..3111692d 100644
--- a/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosScriptEditorController.java
+++ b/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosScriptEditorController.java
@@ -1,7 +1,12 @@
 package org.badvision.outlaweditor;
 
 import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.ResourceBundle;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+import javafx.concurrent.Worker.State;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
@@ -13,6 +18,15 @@ public class MythosScriptEditorController
     implements Initializable {
     
     public static final String MYTHOS_EDITOR = "/mythos/mythos-editor/html/editor.html";
+    private final List<Runnable> onLoadEvents = new ArrayList<>();
+    boolean loaded = false;
+    public synchronized void onLoad(Runnable runnable) {
+        if (loaded) {
+            runnable.run();
+        } else {
+            onLoadEvents.add(runnable);
+        }
+    }
 
     @FXML //  fx:id="editorView"
     WebView editorView; // Value injected by FXMLLoader
@@ -73,6 +87,19 @@ public class MythosScriptEditorController
     
     @Override // This method is called by the FXMLLoader when initialization is complete
     public void initialize(URL fxmlFileLocation, ResourceBundle resources) {
+        editorView.getEngine().getLoadWorker().stateProperty().addListener(
+        new ChangeListener<State>() {
+            public void changed(ObservableValue ov, State oldState, State newState) {
+                if (newState == State.SUCCEEDED) {
+                    loaded = true;
+                    for (Runnable r : onLoadEvents) {
+                        r.run();
+                    }
+                    onLoadEvents.clear();
+                }
+            }
+        });
+
         assert editorView != null : "fx:id=\"editorView\" was not injected: check your FXML file 'MythosScriptEditor.fxml'.";
         assert menuItemAbortChanges != null : "fx:id=\"menuItemAbortChanges\" was not injected: check your FXML file 'MythosScriptEditor.fxml'.";
         assert menuItemAboutBlockly != null : "fx:id=\"menuItemAboutBlockly\" was not injected: check your FXML file 'MythosScriptEditor.fxml'.";
diff --git a/OutlawEditor/src/main/java/org/badvision/outlaweditor/UIAction.java b/OutlawEditor/src/main/java/org/badvision/outlaweditor/UIAction.java
index 716a20f4..f17ea9ef 100644
--- a/OutlawEditor/src/main/java/org/badvision/outlaweditor/UIAction.java
+++ b/OutlawEditor/src/main/java/org/badvision/outlaweditor/UIAction.java
@@ -31,6 +31,8 @@ import javax.swing.JOptionPane;
 import javax.xml.bind.JAXB;
 import org.badvision.outlaweditor.data.TilesetUtils;
 import org.badvision.outlaweditor.data.xml.GameData;
+import org.badvision.outlaweditor.data.xml.IntervalScript;
+import org.badvision.outlaweditor.data.xml.Map;
 import org.badvision.outlaweditor.data.xml.Script;
 
 /**
@@ -203,6 +205,10 @@ public class UIAction {
         script.setName("New Script");
         MythosEditor editor = new MythosEditor(script);
         editor.show();
+        if (Application.instance.controller.currentMap.getScripts() == null) {
+            Application.instance.controller.currentMap.setScripts(new Map.Scripts());
+        }
+        Application.instance.controller.currentMap.getScripts().getScript().add(script);
         return script;
     }
 }
diff --git a/OutlawEditor/src/main/java/org/badvision/outlaweditor/data/TileUtils.java b/OutlawEditor/src/main/java/org/badvision/outlaweditor/data/TileUtils.java
index 4cd868ff..799048b2 100644
--- a/OutlawEditor/src/main/java/org/badvision/outlaweditor/data/TileUtils.java
+++ b/OutlawEditor/src/main/java/org/badvision/outlaweditor/data/TileUtils.java
@@ -12,15 +12,17 @@ import org.badvision.outlaweditor.data.xml.*;
  * @author brobert
  */
 public class TileUtils {
+
     static Map<String, Map<Platform, WritableImage>> display;
+
     static {
         clear();
     }
-    
+
     public static void clear() {
-         display = new ConcurrentHashMap<>();        
+        display = new ConcurrentHashMap<>();
     }
-    
+
     public static Tile newTile() {
         Tile t = new Tile();
         t.setObstruction(false);
@@ -40,18 +42,24 @@ public class TileUtils {
         }
         return t.getId();
     }
-    
+
     public static Map<Platform, WritableImage> getDisplay(Tile t) {
         if (display.get(getId(t)) == null) {
             display.put(getId(t), new EnumMap<Platform, WritableImage>(Platform.class));
         }
         return display.get(getId(t));
     }
-    
+
     public static void redrawTile(Tile t) {
         Map<Platform, WritableImage> displays = getDisplay(t);
         for (PlatformData d : t.getDisplayData()) {
-            Platform p = Platform.valueOf(d.getPlatform());
+            Platform p;
+            try {
+                p = Platform.valueOf(d.getPlatform());
+            } catch (IllegalArgumentException e) {
+                System.err.println("Unable to find any platform support for '" + d.getPlatform() + "'");
+                continue;
+            }
             displays.put(p, p.tileRenderer.redrawSprite(d.getValue(), displays.get(p)));
         }
         DataProducer.notifyObservers(t);
@@ -63,17 +71,17 @@ public class TileUtils {
                 return d.getValue();
             }
         }
-        byte[] out = new byte[p.dataHeight*p.dataWidth];
+        byte[] out = new byte[p.dataHeight * p.dataWidth];
         setPlatformData(t, p, out);
         return out;
     }
-    
+
     public static WritableImage getImage(Tile t, Platform p) {
         Map<Platform, WritableImage> displays = getDisplay(t);
         byte[] data = getPlatformData(t, p);
         return displays.put(p, p.tileRenderer.redrawSprite(data, displays.get(p)));
     }
-   
+
     public static void setImage(Tile t, Platform p, WritableImage img) {
         Map<Platform, WritableImage> displays = getDisplay(t);
         displays.put(p, img);
@@ -91,4 +99,4 @@ public class TileUtils {
         d.setValue(b);
         t.getDisplayData().add(d);
     }
-}
\ No newline at end of file
+}
diff --git a/OutlawEditor/src/main/resources/ApplicationUI.fxml b/OutlawEditor/src/main/resources/ApplicationUI.fxml
index 3b892329..2a337ed0 100644
--- a/OutlawEditor/src/main/resources/ApplicationUI.fxml
+++ b/OutlawEditor/src/main/resources/ApplicationUI.fxml
@@ -2,15 +2,11 @@
 
 <?import java.lang.*?>
 <?import java.net.*?>
-<?import java.util.*?>
 <?import javafx.collections.*?>
-<?import javafx.geometry.*?>
-<?import javafx.scene.*?>
 <?import javafx.scene.control.*?>
-<?import javafx.scene.image.*?>
 <?import javafx.scene.layout.*?>
 
-<AnchorPane id="AnchorPane" prefHeight="500.0" prefWidth="800.0" styleClass="mainFxmlClass" xmlns:fx="http://javafx.com/fxml" fx:controller="org.badvision.outlaweditor.ApplicationUIControllerImpl">
+<AnchorPane id="AnchorPane" prefHeight="575.0" prefWidth="1000.0" styleClass="mainFxmlClass" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.badvision.outlaweditor.ApplicationUIControllerImpl">
   <children>
     <VBox prefHeight="500.0" prefWidth="800.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
       <children>
@@ -73,7 +69,7 @@
                             <Button mnemonicParsing="false" onAction="#onTileDeletePressed" text="Delete" />
                             <MenuButton mnemonicParsing="false" text="Tools">
                               <items>
-                                <Menu mnemonicParsing="false" text="Pattern" fx:id="tilePatternMenu" />
+                                <Menu fx:id="tilePatternMenu" mnemonicParsing="false" text="Pattern" />
                                 <Menu mnemonicParsing="false" text="Draw mode">
                                   <items>
                                     <MenuItem mnemonicParsing="false" onAction="#tileBitMode" text="Bit Toggle" />
@@ -90,13 +86,13 @@
                           <children>
                             <AnchorPane id="imageDetailsPane" prefHeight="200.0" prefWidth="200.0">
                               <children>
-                                <Label layoutX="4.0" layoutY="14.0" text="Name" />
-                                <TextField id="" fx:id="tileNameField" layoutX="53.0" layoutY="11.0" prefWidth="147.0" />
-                                <Label layoutX="4.0" layoutY="36.0" text="ID" />
-                                <TextField fx:id="tileIdField" layoutX="53.0" layoutY="33.0" prefWidth="147.0" />
-                                <Label layoutX="4.0" layoutY="58.0" text="Category" />
-                                <TextField fx:id="tileCategoryField" layoutX="74.0" layoutY="55.0" prefWidth="126.0" />
-                                <CheckBox fx:id="tileObstructionField" layoutX="4.0" layoutY="78.0" mnemonicParsing="false" text="Physical Obstruction" />
+                                <Label layoutX="5.0" layoutY="5.0" prefHeight="29.0" prefWidth="37.0" text="Name" />
+                                <TextField id="" fx:id="tileNameField" layoutX="54.0" layoutY="5.0" prefWidth="147.0" />
+                                <Label layoutX="5.0" layoutY="33.0" prefHeight="29.0" prefWidth="46.0" text="ID" />
+                                <TextField fx:id="tileIdField" layoutX="54.0" layoutY="36.0" prefWidth="147.0" />
+                                <Label layoutX="5.0" layoutY="72.0" text="Category" />
+                                <TextField fx:id="tileCategoryField" layoutX="64.0" layoutY="67.0" prefHeight="26.0" prefWidth="137.0" />
+                                <CheckBox fx:id="tileObstructionField" layoutX="6.0" layoutY="98.0" mnemonicParsing="false" text="Physical Obstruction" />
                               </children>
                             </AnchorPane>
                             <AnchorPane fx:id="tileEditorAnchorPane" prefHeight="387.0" prefWidth="477.0000999999975" HBox.hgrow="ALWAYS" />
@@ -133,7 +129,7 @@
                             <Button mnemonicParsing="false" onAction="#onMapPreviewPressed" text="Preview" />
                             <MenuButton mnemonicParsing="false" text="Tools">
                               <items>
-                                <Menu mnemonicParsing="false" text="Change tile" fx:id="mapSelectTile" />
+                                <Menu fx:id="mapSelectTile" mnemonicParsing="false" text="Change tile" />
                                 <Menu mnemonicParsing="false" text="Draw mode">
                                   <items>
                                     <MenuItem mnemonicParsing="false" onAction="#mapDraw1" text="Radius 1" />
@@ -220,7 +216,7 @@
                             <Button mnemonicParsing="false" onAction="#onImageDeletePressed" text="Delete" />
                             <MenuButton mnemonicParsing="false" text="Tools">
                               <items>
-                                <Menu mnemonicParsing="false" text="Pattern" fx:id="imagePatternMenu" />
+                                <Menu fx:id="imagePatternMenu" mnemonicParsing="false" text="Pattern" />
                                 <Menu mnemonicParsing="false" text="Draw mode">
                                   <items>
                                     <MenuItem mnemonicParsing="false" onAction="#imageBitMode" text="Bit Toggle mode" />
diff --git a/OutlawEditor/src/main/resources/MythosScriptEditor.fxml b/OutlawEditor/src/main/resources/MythosScriptEditor.fxml
index 979bf7c0..db283b69 100644
--- a/OutlawEditor/src/main/resources/MythosScriptEditor.fxml
+++ b/OutlawEditor/src/main/resources/MythosScriptEditor.fxml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import java.lang.*?>
-<?import java.net.*?>
-<?import java.util.*?>
-<?import javafx.scene.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.web.*?>
 
-<AnchorPane id="AnchorPane" prefHeight="400.0" prefWidth="600.0" styleClass="mainFxmlClass" xmlns:fx="http://javafx.com/fxml" fx:controller="org.badvision.outlaweditor.MythosScriptEditorController">
+<AnchorPane id="AnchorPane" prefHeight="748.0" prefWidth="1024.0" styleClass="mainFxmlClass" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8" fx:controller="org.badvision.outlaweditor.MythosScriptEditorController">
   <!--    <stylesheets>
         <URL value="@/styles/mythosscripteditor.css"/>
     </stylesheets>-->
@@ -17,20 +14,20 @@
       <menus>
         <Menu mnemonicParsing="false" text="MythosScript">
           <items>
-            <MenuItem mnemonicParsing="false" onAction="#onApplyChangesSelected" text="Apply changes" fx:id="menuItemApplyChanges" />
-            <MenuItem mnemonicParsing="false" onAction="#onAbortChangesSelected" text="Abort changes" fx:id="menuItemAbortChanges" />
+            <MenuItem fx:id="menuItemApplyChanges" mnemonicParsing="false" onAction="#onApplyChangesSelected" text="Apply changes" />
+            <MenuItem fx:id="menuItemAbortChanges" mnemonicParsing="false" onAction="#onAbortChangesSelected" text="Abort changes" />
           </items>
         </Menu>
         <Menu mnemonicParsing="false" text="Edit">
           <items>
-            <MenuItem mnemonicParsing="false" onAction="#onUndoSelected" text="Undo" fx:id="menuItemUndo" />
-            <MenuItem mnemonicParsing="false" onAction="#onRedoSelected" text="Redo" fx:id="menuItemRedo" />
+            <MenuItem fx:id="menuItemUndo" mnemonicParsing="false" onAction="#onUndoSelected" text="Undo" />
+            <MenuItem fx:id="menuItemRedo" mnemonicParsing="false" onAction="#onRedoSelected" text="Redo" />
           </items>
         </Menu>
         <Menu mnemonicParsing="false" text="Help">
           <items>
-            <MenuItem mnemonicParsing="false" onAction="#onMythosHelpSelected" text="Mythos Script Help" fx:id="menuItemMythosHelp" />
-            <MenuItem mnemonicParsing="false" onAction="#onAboutBlocklySelected" text="About Blockly" fx:id="menuItemAboutBlockly" />
+            <MenuItem fx:id="menuItemMythosHelp" mnemonicParsing="false" onAction="#onMythosHelpSelected" text="Mythos Script Help" />
+            <MenuItem fx:id="menuItemAboutBlockly" mnemonicParsing="false" onAction="#onAboutBlocklySelected" text="About Blockly" />
           </items>
         </Menu>
       </menus>
diff --git a/OutlawEditor/src/main/resources/jaxb/OutlawSchema/OutlawSchema.xsd b/OutlawEditor/src/main/resources/jaxb/OutlawSchema/OutlawSchema.xsd
index 1310f295..bbf7f393 100644
--- a/OutlawEditor/src/main/resources/jaxb/OutlawSchema/OutlawSchema.xsd
+++ b/OutlawEditor/src/main/resources/jaxb/OutlawSchema/OutlawSchema.xsd
@@ -64,14 +64,9 @@
             </xs:element>
             <xs:element name="scripts">
                 <xs:complexType>
-                    <xs:choice maxOccurs="unbounded">
-                        <xs:element name="enter" type="tns:script" minOccurs="0"/>
-                        <xs:element name="exit" type="tns:script" minOccurs="0"/>
-                        <xs:element name="stepOn" type="tns:locationScript" minOccurs="0"/>
-                        <xs:element name="stepOff" type="tns:locationScript" minOccurs="0" />
-                        <xs:element name="interact" type="tns:locationScript" minOccurs="0"/>
-                        <xs:element name="interval" type="tns:intervalScript" minOccurs="0"/>
-                    </xs:choice>
+                    <xs:sequence>
+                        <xs:element name="script" type="tns:script" minOccurs="1" maxOccurs="unbounded"/>
+                    </xs:sequence>
                 </xs:complexType>
             </xs:element>
         </xs:sequence>
@@ -94,6 +89,9 @@
         </xs:sequence>
         <xs:attribute name="inline" type="xs:boolean"/>
         <xs:attribute name="type" use="required" type="xs:NCName"/>
+        <xs:attribute name="id" type="xs:integer"/>
+        <xs:attribute name="uri" type="xs:string"/>
+        <xs:attribute name="local" type="xs:string"/>
         <xs:attribute name="x" type="xs:integer"/>
         <xs:attribute name="y" type="xs:integer"/>
     </xs:complexType>
diff --git a/OutlawEditor/src/main/resources/mythos/mythos-editor/html/editor.html b/OutlawEditor/src/main/resources/mythos/mythos-editor/html/editor.html
index 1f4d8f96..3b006ddc 100644
--- a/OutlawEditor/src/main/resources/mythos/mythos-editor/html/editor.html
+++ b/OutlawEditor/src/main/resources/mythos/mythos-editor/html/editor.html
@@ -19,7 +19,7 @@
         </style>
     </head>
     <body>
-        <div id="blocklyDiv" style="height: 550px; width: 800px;"></div>
+        <div id="blocklyDiv" style="height: 700px; width: 996px;"></div>
 
     <xml id="toolbox" style="display: none">
         <category name="Variables">
diff --git a/OutlawEditor/src/main/resources/testData/blocklytest1.xml b/OutlawEditor/src/main/resources/testData/blocklytest1.xml
index 00b3798b..49ef4797 100644
--- a/OutlawEditor/src/main/resources/testData/blocklytest1.xml
+++ b/OutlawEditor/src/main/resources/testData/blocklytest1.xml
@@ -2,7 +2,7 @@
 <gameData xmlns="outlaw">
     <map>
         <scripts>
-            <enter>
+            <script>
                 <name>name</name>
                 <description>description</description>
                 <block type="variables_set" inline="true" x="245" y="27">
@@ -47,7 +47,7 @@
                         </block>
                     </next>
                 </block>            
-            </enter>
+            </script>
         </scripts>
     </map>
 </gameData>
\ No newline at end of file
diff --git a/OutlawEditor/src/main/resources/testData/blocklytest2.xml b/OutlawEditor/src/main/resources/testData/blocklytest2.xml
index e0416d34..e555b29e 100644
--- a/OutlawEditor/src/main/resources/testData/blocklytest2.xml
+++ b/OutlawEditor/src/main/resources/testData/blocklytest2.xml
@@ -2,7 +2,7 @@
 <gameData xmlns="outlaw">
     <map>
         <scripts>
-            <enter>
+            <script>
                 <name>name</name>
                 <description>description</description>
                 <block type="procedures_defreturn" inline="false" x="213" y="27">
@@ -112,7 +112,26 @@
                         <block type="logic_null"></block>
                     </value>
                 </block>
-            </enter>
+            </script>
+            <script>
+                <name>name</name>
+                <description>description</description>
+                <block type="procedures_defreturn" id="2" inline="false" x="3" y="5">
+                    <mutation></mutation>
+                    <field name="NAME">New function2</field>
+                    <statement name="STACK">
+                        <block type="text_moveto" id="20">
+                            <field name="x">0</field>
+                            <field name="y">0</field>
+                            <next>
+                                <block type="math_change" id="32" inline="true">
+                                    <field name="VAR">item</field>
+                                </block>
+                            </next>
+                        </block>
+                    </statement>
+                </block>
+            </script>
         </scripts>
     </map>
 </gameData>
\ No newline at end of file
diff --git a/OutlawEditor/src/test/java/org/badvision/outlaweditor/test/TestMythosEditor.java b/OutlawEditor/src/test/java/org/badvision/outlaweditor/test/TestMythosEditor.java
index f5549a66..8009bb7d 100644
--- a/OutlawEditor/src/test/java/org/badvision/outlaweditor/test/TestMythosEditor.java
+++ b/OutlawEditor/src/test/java/org/badvision/outlaweditor/test/TestMythosEditor.java
@@ -5,9 +5,7 @@ import java.io.IOException;
 import java.io.StringWriter;
 import javax.xml.bind.JAXB;
 import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
 import javax.xml.bind.Marshaller;
-import javax.xml.namespace.QName;
 import org.badvision.outlaweditor.data.xml.Block;
 import org.badvision.outlaweditor.data.xml.GameData;
 import org.badvision.outlaweditor.data.xml.Map;
@@ -53,7 +51,7 @@ public class TestMythosEditor {
             script.setDescription("description");
             script.setBlock(theBlock);
             map.setScripts(new Scripts());
-            map.getScripts().getEnterOrExitOrStepOn().add(new JAXBElement<Script>(new QName("outlaw", "enter"), Script.class, script));            
+            map.getScripts().getScript().add(script);            
             m.marshal(d, testWriter);
             String testOutput = testWriter.getBuffer().toString();
             assertNotNull(testOutput);
@@ -92,9 +90,9 @@ public class TestMythosEditor {
         assertEquals(1, gd.getMap().size());
         Scripts s = gd.getMap().get(0).getScripts();
         assertNotNull(s);
-        assertNotNull(s.getEnterOrExitOrStepOn());
-        assertEquals(1, s.getEnterOrExitOrStepOn().size());
-        Script scr = (Script) s.getEnterOrExitOrStepOn().get(0).getValue();
+        assertNotNull(s.getScript());
+        assertTrue(s.getScript().size() > 0);
+        Script scr = (Script) s.getScript().get(0);
         return scr.getBlock();
     }
 }

From 763507acf3f34b9b85375bf43e34605d41211044 Mon Sep 17 00:00:00 2001
From: Brendan Robert <brendan.robert@gmail.com>
Date: Sat, 12 Apr 2014 22:36:25 -0500
Subject: [PATCH 2/3] Direct hookup between the MythosEditor (java) and the
 Mythos (javascript) objects -- now the real blockly integration work can
 begin!

---
 .../badvision/outlaweditor/MythosEditor.java  | 65 ++++++++-------
 .../MythosScriptEditorController.java         | 83 +++++++++++--------
 .../mythos-editor/js/mythos_uncompressed.js   | 18 ++++
 3 files changed, 103 insertions(+), 63 deletions(-)

diff --git a/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosEditor.java b/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosEditor.java
index 24d1388c..3fab1f5b 100644
--- a/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosEditor.java
+++ b/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosEditor.java
@@ -2,8 +2,9 @@ package org.badvision.outlaweditor;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.io.StringReader;
 import java.io.StringWriter;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javafx.event.EventHandler;
@@ -22,7 +23,6 @@ import javax.xml.parsers.ParserConfigurationException;
 import org.badvision.outlaweditor.data.xml.Block;
 import org.badvision.outlaweditor.data.xml.Script;
 import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
 /**
@@ -43,10 +43,11 @@ public class MythosEditor {
 
     public void show() {
         primaryStage = new Stage();
-        javafx.application.Platform.setImplicitExit(true);
 
         FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("/MythosScriptEditor.fxml"));
-        fxmlLoader.setResources(null);
+        Map<String,String> properties = new HashMap<>();
+        properties.put(MythosScriptEditorController.ONLOAD_SCRIPT, generateLoadScript());
+        fxmlLoader.setResources(MythosScriptEditorController.createResourceBundle(properties));
         try {
             AnchorPane node = (AnchorPane) fxmlLoader.load();
             controller = fxmlLoader.getController();
@@ -64,23 +65,21 @@ public class MythosEditor {
             }
         });
         primaryStage.show();
-        controller.onLoad(new Runnable() {
+    }
+
+    public void close() {
+        javafx.application.Platform.runLater(new Runnable() {
             @Override
             public void run() {
-                loadScript();
+                primaryStage.getScene().getRoot().setDisable(true);
+                primaryStage.close();
             }
         });
     }
 
-    public void close() {
-        primaryStage.close();
-    }
-
     public void applyChanges() {
         try {
-            String xml = String.valueOf(controller.editorView.getEngine().executeScript("Blockly.Xml.workspaceToDom(Blockly.mainWorkspace).outerHTML"));
-            xml = xml.replace("<xml>", "");
-            xml = xml.replace("</xml>", "");
+            String xml = controller.getScriptXml();
             JAXBContext context = JAXBContext.newInstance("org.badvision.outlaweditor.data.xml");
             Unmarshaller unmarshaller = context.createUnmarshaller();
             DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -94,31 +93,37 @@ public class MythosEditor {
         }
     }
 
-    public void loadScript() {
+    public String generateLoadScript() {
         if (script == null || script.getBlock() == null) {
-            loadScript(createDefaultScript());
-            return;
-        }
-        try {
-            JAXBContext context = JAXBContext.newInstance(Block.class);
-            StringWriter buffer = new StringWriter();
-            context.createMarshaller().marshal(script.getBlock(), buffer);
-            String xml = buffer.toString();
-            loadScript(xml);
-        } catch (JAXBException ex) {
-            Logger.getLogger(MythosEditor.class.getName()).log(Level.SEVERE, null, ex);
+            return generateLoadScript(getDefaultBlockMarkup());
+        } else {
+            try {
+                JAXBContext context = JAXBContext.newInstance(Block.class);
+                StringWriter buffer = new StringWriter();
+                context.createMarshaller().marshal(script.getBlock(), buffer);
+                String xml = buffer.toString();
+                return generateLoadScript(xml);
+            } catch (JAXBException ex) {
+                Logger.getLogger(MythosEditor.class.getName()).log(Level.SEVERE, null, ex);
+            }
         }
+        return null;
     }
 
-    public void loadScript(String xml) {
+    public String generateLoadScript(String xml) {
         xml = XML_HEADER + xml;
         xml = xml.replaceAll("'", "\\'");
         xml = xml.replaceAll("\n", "");
-        String loadScript = "Blockly.Xml.domToWorkspace(Blockly.mainWorkspace, Blockly.Xml.textToDom('" + xml + "'));";
-        controller.editorView.getEngine().executeScript(loadScript);
+        String loadScript = "Mythos.setScriptXml('"+xml+"');";
+        return loadScript;
     }
 
-    private String createDefaultScript() {
-        return "<xml><block type=\"procedures_defreturn\" id=\"1\" inline=\"false\" x=\"5\" y=\"5\"><mutation></mutation><field name=\"NAME\">New function</field></block></xml>";
+    private String getDefaultBlockMarkup() {
+        return "<xml><block type=\"procedures_defreturn\" id=\"1\" inline=\"false\" x=\"5\" y=\"5\"><mutation></mutation><field name=\"NAME\">NewScript</field></block></xml>";
+    }
+    
+    // Called when the name of the root block is changed in the JS editor
+    public void setFunctionName(String name) {
+        System.out.println("Function title changed! >> "+name);
     }
 }
diff --git a/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosScriptEditorController.java b/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosScriptEditorController.java
index 3111692d..6069a3bd 100644
--- a/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosScriptEditorController.java
+++ b/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosScriptEditorController.java
@@ -1,9 +1,10 @@
 package org.badvision.outlaweditor;
 
 import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.ListResourceBundle;
+import java.util.Map;
 import java.util.ResourceBundle;
+import java.util.Set;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.concurrent.Worker.State;
@@ -12,21 +13,15 @@ import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
 import javafx.scene.control.MenuItem;
 import javafx.scene.web.WebView;
-
+import netscape.javascript.JSObject;
 
 public class MythosScriptEditorController
-    implements Initializable {
-    
+        implements Initializable {
+
     public static final String MYTHOS_EDITOR = "/mythos/mythos-editor/html/editor.html";
-    private final List<Runnable> onLoadEvents = new ArrayList<>();
-    boolean loaded = false;
-    public synchronized void onLoad(Runnable runnable) {
-        if (loaded) {
-            runnable.run();
-        } else {
-            onLoadEvents.add(runnable);
-        }
-    }
+    public static final String ONLOAD_SCRIPT = "onloadScript";
+    // This is tied to the Mythos object defined in mythos_uncompressed
+    JSObject mythos;
 
     @FXML //  fx:id="editorView"
     WebView editorView; // Value injected by FXMLLoader
@@ -50,10 +45,11 @@ public class MythosScriptEditorController
     private MenuItem menuItemUndo; // Value injected by FXMLLoader
 
     MythosEditor editor;
+
     public void setEditor(MythosEditor editor) {
         this.editor = editor;
-    }    
-    
+    }
+
     // Handler for MenuItem[fx:id="menuItemAbortChanges"] onAction
     public void onAbortChangesSelected(ActionEvent event) {
         editor.close();
@@ -83,23 +79,10 @@ public class MythosScriptEditorController
     // Handler for MenuItem[fx:id="menuItemUndo"] onAction
     public void onUndoSelected(ActionEvent event) {
         // handle the event here
-    }    
-    
+    }
+
     @Override // This method is called by the FXMLLoader when initialization is complete
     public void initialize(URL fxmlFileLocation, ResourceBundle resources) {
-        editorView.getEngine().getLoadWorker().stateProperty().addListener(
-        new ChangeListener<State>() {
-            public void changed(ObservableValue ov, State oldState, State newState) {
-                if (newState == State.SUCCEEDED) {
-                    loaded = true;
-                    for (Runnable r : onLoadEvents) {
-                        r.run();
-                    }
-                    onLoadEvents.clear();
-                }
-            }
-        });
-
         assert editorView != null : "fx:id=\"editorView\" was not injected: check your FXML file 'MythosScriptEditor.fxml'.";
         assert menuItemAbortChanges != null : "fx:id=\"menuItemAbortChanges\" was not injected: check your FXML file 'MythosScriptEditor.fxml'.";
         assert menuItemAboutBlockly != null : "fx:id=\"menuItemAboutBlockly\" was not injected: check your FXML file 'MythosScriptEditor.fxml'.";
@@ -107,7 +90,41 @@ public class MythosScriptEditorController
         assert menuItemMythosHelp != null : "fx:id=\"menuItemMythosHelp\" was not injected: check your FXML file 'MythosScriptEditor.fxml'.";
         assert menuItemRedo != null : "fx:id=\"menuItemRedo\" was not injected: check your FXML file 'MythosScriptEditor.fxml'.";
         assert menuItemUndo != null : "fx:id=\"menuItemUndo\" was not injected: check your FXML file 'MythosScriptEditor.fxml'.";
-        
-        editorView.getEngine().load(getClass().getResource(MYTHOS_EDITOR).toExternalForm());    
+
+        final String loadScript = resources.getString(ONLOAD_SCRIPT);
+        if (loadScript != null) {
+            editorView.getEngine().getLoadWorker().stateProperty().addListener(
+                    new ChangeListener<State>() {
+                        @Override
+                        public void changed(ObservableValue ov, State oldState, State newState) {
+                            if (newState == State.SUCCEEDED) {
+                                mythos = (JSObject) editorView.getEngine().executeScript("Mythos");
+                                mythos.setMember("editor", editor);
+                                editorView.getEngine().executeScript(loadScript);
+                            }
+                        }
+                    });
+        }
+        editorView.getEngine().load(getClass().getResource(MYTHOS_EDITOR).toExternalForm());
+    }
+
+    public static ResourceBundle createResourceBundle(final Map<String, String> input) {
+        return new ListResourceBundle() {
+            @Override
+            protected Object[][] getContents() {
+                Object[][] output = new Object[input.size()][2];
+                Set<String> keys = input.keySet();
+                int i = 0;
+                for (String key : keys) {
+                    output[i] = new Object[]{key, input.get(key)};
+                    i++;
+                }
+                return output;
+            }
+        };
+    }
+
+    public String getScriptXml() {
+        return String.valueOf(editorView.getEngine().executeScript("Mythos.getScriptXml();"));
     }
 }
diff --git a/OutlawEditor/src/main/resources/mythos/mythos-editor/js/mythos_uncompressed.js b/OutlawEditor/src/main/resources/mythos/mythos-editor/js/mythos_uncompressed.js
index 6bf173cc..4a575a1d 100644
--- a/OutlawEditor/src/main/resources/mythos/mythos-editor/js/mythos_uncompressed.js
+++ b/OutlawEditor/src/main/resources/mythos/mythos-editor/js/mythos_uncompressed.js
@@ -1,5 +1,23 @@
 if (typeof Mythos === "undefined") {
+    // Hook up the rename function to notify the java editor when changes occur
+    Blockly.Procedures.rename_old = Blockly.Procedures.rename;
+    Blockly.Procedures.rename = function(name) {
+        Mythos.editor.setFunctionName(name);
+        return Blockly.Procedures.rename_old.call(this,name);
+    };
+    
     Mythos = {
+        setScriptXml: function(xml) {
+            Blockly.mainWorkspace.clear();
+            var dom = Blockly.Xml.textToDom(xml);
+            Blockly.Xml.domToWorkspace(Blockly.mainWorkspace, dom);
+            while (Blockly.mainWorkspace.topBlocks_.length > 1) {
+                Blockly.mainWorkspace.topBlocks_[1].dispose();
+            }
+        },
+        getScriptXml: function() {
+            return Blockly.Xml.workspaceToDom(Blockly.mainWorkspace).innerHTML;
+        },
         helpUrl: 'https://docs.google.com/document/d/1VXbiY4G533-cokjQevZFhwvqMMCL--17ziMAoFoeJ5M/edit#heading=h.yv9dmneqjr2b',
         initBlocks: function() {
             Blockly.Blocks['flow_for'] = {

From a21a38bf4c7243d882ec2f4ed593ffabc940601c Mon Sep 17 00:00:00 2001
From: Brendan Robert <brendan.robert@gmail.com>
Date: Sun, 13 Apr 2014 00:19:50 -0500
Subject: [PATCH 3/3] Script editing is now completely hooked up to load/save

---
 .../outlaweditor/ApplicationUIController.java |  5 ---
 .../ApplicationUIControllerImpl.java          | 42 +++++++++++++++----
 .../badvision/outlaweditor/MythosEditor.java  | 17 ++++++--
 .../org/badvision/outlaweditor/UIAction.java  | 16 ++++---
 .../src/main/resources/ApplicationUI.fxml     |  2 +-
 5 files changed, 60 insertions(+), 22 deletions(-)

diff --git a/OutlawEditor/src/main/java/org/badvision/outlaweditor/ApplicationUIController.java b/OutlawEditor/src/main/java/org/badvision/outlaweditor/ApplicationUIController.java
index 370937d5..15830daa 100644
--- a/OutlawEditor/src/main/java/org/badvision/outlaweditor/ApplicationUIController.java
+++ b/OutlawEditor/src/main/java/org/badvision/outlaweditor/ApplicationUIController.java
@@ -18,7 +18,6 @@ import org.badvision.outlaweditor.data.xml.Script;
 import org.badvision.outlaweditor.data.xml.Tile;
 
 public abstract class ApplicationUIController {
-
     @FXML // ResourceBundle that was given to the FXMLLoader
     protected ResourceBundle resources;
     @FXML // URL location of the FXML file that was given to the FXMLLoader
@@ -218,10 +217,6 @@ public abstract class ApplicationUIController {
     // Handler for Button[Button[id=null, styleClass=button]] onAction
     @FXML
     abstract public void onMapScriptClonePressed(ActionEvent event);
-
-    // Handler for onClick
-    @FXML
-    abstract public void onMapScriptClicked(MouseEvent event);
     
     // Handler for Button[Button[id=null, styleClass=button]] onAction
     @FXML
diff --git a/OutlawEditor/src/main/java/org/badvision/outlaweditor/ApplicationUIControllerImpl.java b/OutlawEditor/src/main/java/org/badvision/outlaweditor/ApplicationUIControllerImpl.java
index f9424f87..919bd603 100644
--- a/OutlawEditor/src/main/java/org/badvision/outlaweditor/ApplicationUIControllerImpl.java
+++ b/OutlawEditor/src/main/java/org/badvision/outlaweditor/ApplicationUIControllerImpl.java
@@ -1,6 +1,5 @@
 package org.badvision.outlaweditor;
 
-import org.badvision.outlaweditor.apple.AppleTileRenderer;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -21,12 +20,14 @@ import javafx.scene.input.MouseEvent;
 import javafx.util.Callback;
 import static org.badvision.outlaweditor.Application.currentPlatform;
 import static org.badvision.outlaweditor.Application.gameData;
-import static org.badvision.outlaweditor.data.PropertyHelper.*;
 import static org.badvision.outlaweditor.UIAction.*;
+import org.badvision.outlaweditor.apple.AppleTileRenderer;
+import static org.badvision.outlaweditor.data.PropertyHelper.*;
 import org.badvision.outlaweditor.data.TileUtils;
 import org.badvision.outlaweditor.data.TilesetUtils;
 import org.badvision.outlaweditor.data.xml.Image;
 import org.badvision.outlaweditor.data.xml.PlatformData;
+import org.badvision.outlaweditor.data.xml.Script;
 import org.badvision.outlaweditor.data.xml.Tile;
 
 /**
@@ -465,12 +466,6 @@ public class ApplicationUIControllerImpl extends ApplicationUIController {
         throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
     }
     
-    @Override
-    public void onMapScriptClicked(MouseEvent event) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-
     @Override
     public void onMapSelected(ActionEvent event) {
         setCurrentMap(mapSelect.getSelectionModel().getSelectedItem());
@@ -737,6 +732,7 @@ public class ApplicationUIControllerImpl extends ApplicationUIController {
             currentMapEditor.setEntity(m);
             currentMapEditor.buildEditorUI(mapEditorAnchorPane);
         }
+        redrawMapScripts();
     }
 
     public void rebuildMapSelectors() {
@@ -837,6 +833,36 @@ public class ApplicationUIControllerImpl extends ApplicationUIController {
         return null;
     }
 
+    public void redrawMapScripts() {
+        mapScriptsList.setOnEditStart(new EventHandler<ListView.EditEvent<Script>>() {
+            @Override
+            public void handle(ListView.EditEvent<Script> event) {
+                  UIAction.editScript(event.getSource().getItems().get(event.getIndex()));
+            }
+        });
+        mapScriptsList.setCellFactory(new Callback<ListView<Script>, ListCell<Script>>() {
+            @Override
+            public ListCell<Script> call(ListView<Script> param) {
+                return new ListCell<Script>() {
+                    @Override
+                    protected void updateItem(Script item, boolean empty) {
+                        super.updateItem(item, empty);
+                        if (empty || item == null) {                            
+                            setText("");
+                        } else {
+                            setText(item.getName());
+                        }
+                    }
+                };
+            }
+        });
+        if (currentMap == null) {
+            mapScriptsList.getItems().clear();
+        } else {
+            mapScriptsList.getItems().setAll(currentMap.getScripts().getScript());
+        }
+    }
+
     abstract public static class EntitySelectorCell<T> extends ComboBoxListCell<T> {
 
         static Map<TextField, Object> lastSelected = new HashMap<>();
diff --git a/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosEditor.java b/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosEditor.java
index 3fab1f5b..0ec5479d 100644
--- a/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosEditor.java
+++ b/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosEditor.java
@@ -17,6 +17,7 @@ import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
+import javax.xml.namespace.QName;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
@@ -100,8 +101,13 @@ public class MythosEditor {
             try {
                 JAXBContext context = JAXBContext.newInstance(Block.class);
                 StringWriter buffer = new StringWriter();
-                context.createMarshaller().marshal(script.getBlock(), buffer);
+                QName qName = new QName("outlaw","block");
+                JAXBElement<Block> root = new JAXBElement<>(qName, Block.class, script.getBlock()); 
+                context.createMarshaller().marshal(root, buffer);
                 String xml = buffer.toString();
+                xml=xml.replace("?>", "?><xml>");
+                xml += "</xml>";
+                System.out.println("xml: "+xml);
                 return generateLoadScript(xml);
             } catch (JAXBException ex) {
                 Logger.getLogger(MythosEditor.class.getName()).log(Level.SEVERE, null, ex);
@@ -111,7 +117,6 @@ public class MythosEditor {
     }
 
     public String generateLoadScript(String xml) {
-        xml = XML_HEADER + xml;
         xml = xml.replaceAll("'", "\\'");
         xml = xml.replaceAll("\n", "");
         String loadScript = "Mythos.setScriptXml('"+xml+"');";
@@ -119,11 +124,17 @@ public class MythosEditor {
     }
 
     private String getDefaultBlockMarkup() {
-        return "<xml><block type=\"procedures_defreturn\" id=\"1\" inline=\"false\" x=\"5\" y=\"5\"><mutation></mutation><field name=\"NAME\">NewScript</field></block></xml>";
+        return XML_HEADER+"<xml><block type=\"procedures_defreturn\" id=\"1\" inline=\"false\" x=\"5\" y=\"5\"><mutation></mutation><field name=\"NAME\">NewScript</field></block></xml>";
     }
     
     // Called when the name of the root block is changed in the JS editor
     public void setFunctionName(String name) {
+        if (script == null) {
+            System.out.println("How can the script be null??  wanted to set script name to "+name);            
+            return;
+        }
+        script.setName(name);
         System.out.println("Function title changed! >> "+name);
+        Application.instance.controller.redrawMapScripts();
     }
 }
diff --git a/OutlawEditor/src/main/java/org/badvision/outlaweditor/UIAction.java b/OutlawEditor/src/main/java/org/badvision/outlaweditor/UIAction.java
index f17ea9ef..d498b5b9 100644
--- a/OutlawEditor/src/main/java/org/badvision/outlaweditor/UIAction.java
+++ b/OutlawEditor/src/main/java/org/badvision/outlaweditor/UIAction.java
@@ -27,11 +27,9 @@ import javafx.scene.layout.VBoxBuilder;
 import javafx.scene.text.Text;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
-import javax.swing.JOptionPane;
 import javax.xml.bind.JAXB;
 import org.badvision.outlaweditor.data.TilesetUtils;
 import org.badvision.outlaweditor.data.xml.GameData;
-import org.badvision.outlaweditor.data.xml.IntervalScript;
 import org.badvision.outlaweditor.data.xml.Map;
 import org.badvision.outlaweditor.data.xml.Script;
 
@@ -203,12 +201,20 @@ public class UIAction {
     public static Script createAndEditScript() {
         Script script = new Script();
         script.setName("New Script");
-        MythosEditor editor = new MythosEditor(script);
-        editor.show();
         if (Application.instance.controller.currentMap.getScripts() == null) {
             Application.instance.controller.currentMap.setScripts(new Map.Scripts());
         }
         Application.instance.controller.currentMap.getScripts().getScript().add(script);
-        return script;
+        return editScript(script);
+    }
+    
+    public static Script editScript(Script script) {
+        if (script == null) {
+            System.err.println("Requested to edit a null script object, ignoring!");
+            return null;
+        }
+        MythosEditor editor = new MythosEditor(script);
+        editor.show();
+        return script;        
     }
 }
diff --git a/OutlawEditor/src/main/resources/ApplicationUI.fxml b/OutlawEditor/src/main/resources/ApplicationUI.fxml
index 2a337ed0..59f6d009 100644
--- a/OutlawEditor/src/main/resources/ApplicationUI.fxml
+++ b/OutlawEditor/src/main/resources/ApplicationUI.fxml
@@ -160,7 +160,7 @@
                                   <content>
                                     <AnchorPane id="Content" minHeight="0.0" minWidth="0.0" prefHeight="200.0" prefWidth="200.0">
                                       <children>
-                                        <ListView fx:id="mapScriptsList" onMouseClicked="#onMapScriptClicked" prefHeight="217.0" prefWidth="199.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
+                                        <ListView fx:id="mapScriptsList" editable="true" prefHeight="217.0" prefWidth="199.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
                                       </children>
                                     </AnchorPane>
                                   </content>