Fix conversion of OPI script and command actions to BOB format

Currently these cannot be parsed and so the actions get removed
in the conveerted BOB.

Author: rjwills28

app/display/actions/src/main/java/org/csstudio/display/actions/ExecuteCommandAction.java

@@ -93,7 +93,7 @@ public void writeToXML(ModelWriter modelWriter, XMLStreamWriter writer) throws E
     @Override
     public boolean matchesAction(String actionId) {
         return actionId.equalsIgnoreCase(EXECUTE_COMMAND) ||
-                "EXECUTE_CMD".equalsIgnoreCase(type);
+                actionId.equalsIgnoreCase("EXECUTE_CMD");
     }
 
     public String getCommand() {

app/display/actions/src/main/java/org/csstudio/display/actions/ExecuteScriptAction.java

@@ -58,6 +58,7 @@ public Image getImage() {
 
     @Override
     public void readFromXML(ModelReader modelReader, Element actionXml) throws Exception {
+        String type = actionXml.getAttribute(XMLTags.TYPE);
         if (type.equalsIgnoreCase(EXECUTE_SCRIPT)) {
             // <script file="EmbeddedPy">
             //   <text>  the embedded text  </text>
@@ -105,10 +106,10 @@ public void writeToXML(ModelWriter modelWriter, XMLStreamWriter writer) throws E
         writer.writeAttribute(XMLTags.TYPE, EXECUTE_SCRIPT);
         writeDescriptionToXML(writer, description);
         writer.writeStartElement(XMLTags.SCRIPT);
-        writer.writeAttribute(XMLTags.FILE, path);
+        writer.writeAttribute(XMLTags.FILE, scriptInfo.getPath());
         // The controller updates the text and path not the scriptInfo
-        if (this.path.equals(ScriptInfo.EMBEDDED_PYTHON) ||
-                this.path.equals(ScriptInfo.EMBEDDED_JAVASCRIPT)) {
+        if (scriptInfo.getPath().equals(ScriptInfo.EMBEDDED_PYTHON) ||
+                scriptInfo.getPath().equals(ScriptInfo.EMBEDDED_JAVASCRIPT)) {
             final String text = this.text;
             if (text != null) {
                 writer.writeStartElement(XMLTags.TEXT);
@@ -119,6 +120,13 @@ public void writeToXML(ModelWriter modelWriter, XMLStreamWriter writer) throws E
         writer.writeEndElement();
     }
 
+    @Override
+    public boolean matchesAction(String actionId) {
+        return actionId.equalsIgnoreCase(EXECUTE_SCRIPT) ||
+                actionId.equalsIgnoreCase(EXECUTE_PYTHONSCRIPT) ||
+                actionId.equalsIgnoreCase(EXECUTE_JAVASCRIPT);
+    }
+    
     public ScriptInfo getScriptInfo() {
         return scriptInfo;
     }