Merge pull request #4 from praxis-live/develop

Merge develop to master for v3.1.0 release

nbproject/project.properties

@@ -3,10 +3,10 @@ app.name=${branding.token}
 app.title=Praxis LIVE
 app.conf=praxis_live.conf
 app.icon.icns=praxislive.icns
-app.version=3.0.0
+app.version=3.1.0
 auxiliary.org-netbeans-modules-apisupport-installer.license-type=no
 auxiliary.org-netbeans-modules-apisupport-installer.os-linux=false
-auxiliary.org-netbeans-modules-apisupport-installer.os-macosx=true
+auxiliary.org-netbeans-modules-apisupport-installer.os-macosx=false
 auxiliary.org-netbeans-modules-apisupport-installer.os-solaris=false
 auxiliary.org-netbeans-modules-apisupport-installer.os-windows=true
 auxiliary.org-netbeans-modules-apisupport-installer.pack200-enabled=false

praxis.live.pxr.graph/src/net/neilcsmith/praxis/live/pxr/graph/GraphEditor.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2016 Neil C Smith.
+ * Copyright 2017 Neil C Smith.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3 only, as
@@ -413,7 +413,11 @@ private void buildChild(String id, final ComponentProxy cmp) {
         widget.getActions().addAction(ActionFactory.createEditAction(new EditProvider() {
             @Override
             public void edit(Widget widget) {
-                cmp.getNodeDelegate().getPreferredAction().actionPerformed(new ActionEvent(this, ActionEvent.ACTION_PERFORMED, "edit"));
+                if (cmp instanceof ContainerProxy) {
+                    new ContainerOpenAction((ContainerProxy) cmp).actionPerformed(new ActionEvent(this, ActionEvent.ACTION_PERFORMED, "edit"));
+                } else {
+                    cmp.getNodeDelegate().getPreferredAction().actionPerformed(new ActionEvent(this, ActionEvent.ACTION_PERFORMED, "edit"));
+                }
             }
         }));
         final CommentAction commentAction = new CommentAction(widget);