Merge pull request #11 from praxis-live/develop

Merge develop to master for v4.1.0 release
praxis-live · Aug 24, 2018 · cb22635 · cb22635
2 parents 851098f + 8edc25c
commit cb22635
Show file tree

Hide file tree

Showing 26 changed files with 2,025 additions and 91 deletions.
diff --git a/lib.processing/manifest.mf b/lib.processing/manifest.mf
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
 OpenIDE-Module: processing.core
 OpenIDE-Module-Localizing-Bundle: processing/core/Bundle.properties
-OpenIDE-Module-Specification-Version: 3.3.7
+OpenIDE-Module-Specification-Version: 3.4.0
 
diff --git a/lib.processing/release/modules/ext/core.jar b/lib.processing/release/modules/ext/core.jar
diff --git a/nbproject/project.properties b/nbproject/project.properties
@@ -2,7 +2,7 @@ app.icon=branding/core/core.jar/org/netbeans/core/startup/frame48.gif
 app.name=${branding.token}
 app.title=praxis
 app.conf=praxis.conf
-app.version=4.0.0
+app.version=4.1.0
 auxiliary.org-netbeans-modules-apisupport-installer.license-type=no
 auxiliary.org-netbeans-modules-apisupport-installer.os-linux=true
 auxiliary.org-netbeans-modules-apisupport-installer.os-macosx=false

diff --git a/praxis.audio/src/org/praxislive/audio/AudioPort.java b/praxis.audio/src/org/praxislive/audio/AudioPort.java
@@ -97,7 +97,7 @@ protected final void breakConnection(Input port, Pipe source) {
     public static class Provider implements Port.TypeProvider {
 
         @Override
-        public Stream<Type> types() {
+        public Stream<Type<?>> types() {
             return Stream.of(new Port.Type<>(AudioPort.class));
         }
 

diff --git a/praxis.code/src/META-INF/services/org.praxislive.core.Port$TypeProvider b/praxis.code/src/META-INF/services/org.praxislive.core.Port$TypeProvider
@@ -0,0 +1 @@
+org.praxislive.code.DataPort$Provider
diff --git a/praxis.code/src/org/praxislive/code/CodeConnector.java b/praxis.code/src/org/praxislive/code/CodeConnector.java
@@ -37,6 +37,7 @@
 import org.praxislive.code.userapi.AuxIn;
 import org.praxislive.code.userapi.AuxOut;
 import org.praxislive.code.userapi.Config;
+import org.praxislive.code.userapi.Data;
 import org.praxislive.code.userapi.ID;
 import org.praxislive.code.userapi.In;
 import org.praxislive.code.userapi.Inject;
@@ -267,11 +268,16 @@ protected void analyseField(Field field) {
         }
 
         P prop = field.getAnnotation(P.class);
-        if (prop != null && analysePropertyField(prop, field)) {
-            return;
-        }
-        if (prop != null && analyseCustomPropertyField(prop, field)) {
-            return;
+        if (prop != null) {
+            if (analyseResourcePropertyField(prop, field)) {
+                return;
+            }
+            if (analysePropertyField(prop, field)) {
+                return;
+            }
+            if (analyseCustomPropertyField(prop, field)) {
+                return;
+            }
         }
         T trig = field.getAnnotation(T.class);
         if (trig != null && analyseTriggerField(trig, field)) {
@@ -327,9 +333,15 @@ private boolean analyseInputField(In ann, Field field) {
             addPort(odsc);
             addControl(InputPortControl.Descriptor.createInput(odsc.getID(), odsc.getIndex(), odsc));
             return true;
-        } else {
-            return false;
         }
+
+        DataPort.InputDescriptor din = DataPort.InputDescriptor.create(this, ann, field);
+        if (din != null) {
+            addPort(din);
+            return true;
+        }
+
+        return false;
     }
 
     private boolean analyseAuxInputField(AuxIn ann, Field field) {
@@ -338,29 +350,49 @@ private boolean analyseAuxInputField(AuxIn ann, Field field) {
             addPort(odsc);
             addControl(InputPortControl.Descriptor.createAuxInput(odsc.getID(), odsc.getIndex(), odsc));
             return true;
-        } else {
-            return false;
         }
+
+        DataPort.InputDescriptor din = DataPort.InputDescriptor.create(this, ann, field);
+        if (din != null) {
+            addPort(din);
+            return true;
+        }
+
+        return false;
+
     }
 
     private boolean analyseOutputField(Out ann, Field field) {
         OutputImpl.Descriptor odsc = OutputImpl.createDescriptor(this, ann, field);
         if (odsc != null) {
             addPort(odsc);
             return true;
-        } else {
-            return false;
+        } 
+
+        DataPort.OutputDescriptor dout = DataPort.OutputDescriptor.create(this, ann, field);
+        if (dout != null) {
+            addPort(dout);
+            return true;
         }
+
+        return false;
     }
 
     private boolean analyseAuxOutputField(AuxOut ann, Field field) {
         OutputImpl.Descriptor odsc = OutputImpl.createDescriptor(this, ann, field);
         if (odsc != null) {
             addPort(odsc);
             return true;
-        } else {
-            return false;
         }
+
+        DataPort.OutputDescriptor dout = DataPort.OutputDescriptor.create(this, ann, field);
+        if (dout != null) {
+            addPort(dout);
+            return true;
+        }
+
+        return false;
+
     }
 
     private boolean analyseTriggerField(T ann, Field field) {
@@ -376,6 +408,22 @@ private boolean analyseTriggerField(T ann, Field field) {
             return false;
         }
     }
+
+    private boolean analyseResourcePropertyField(P ann, Field field) {
+        if (field.getAnnotation(Type.Resource.class) != null &&
+                String.class.equals(field.getType())) {
+            ResourceProperty.Descriptor<String> rpd =
+                    ResourceProperty.Descriptor.create(this, ann, field, ResourceProperty.getStringLoader());
+            if (rpd != null) {
+                addControl(rpd);
+                if (shouldAddPort(field)) {
+                    addPort(rpd.createPortDescriptor());
+                }
+                return true;
+            }
+        }
+        return false;
+    }
 
     private boolean analysePropertyField(P ann, Field field) {
         PropertyControl.Descriptor pdsc
@@ -411,9 +459,20 @@ private boolean analyseCustomPropertyField(P ann, Field field) {
     private boolean analyseInjectField(Inject ann, Field field) {
 
         if (Ref.class.equals(field.getType())) {
-            ReferenceDescriptor rdsc = RefImpl.Descriptor.create(this, field);
+            RefImpl.Descriptor rdsc = RefImpl.Descriptor.create(this, field);
             if (rdsc != null) {
                 addReference(rdsc);
+                addControl(rdsc.getControlDescriptor());
+                return true;
+            } else {
+                return false;
+            }
+        }
+
+        if (Data.Sink.class.equals(field.getType())) {
+            DataSink.Descriptor dsdsc = DataSink.Descriptor.create(this, field);
+            if (dsdsc != null) {
+                addReference(dsdsc);
                 return true;
             } else {
                 return false;

diff --git a/praxis.code/src/org/praxislive/code/CodeContext.java b/praxis.code/src/org/praxislive/code/CodeContext.java
@@ -326,12 +326,12 @@ protected void update(long time) {
             }
         }
     }
-
-    public void invoke(long time, Invoker invoker) {
+    
+    public void invoke(long time, Runnable task) {
         if (checkActive()) {
             update(time);
             try {
-                invoker.invoke();
+                task.run();
             } catch (Exception ex) {
                 log.log(LogLevel.ERROR, ex);
             }
@@ -404,9 +404,14 @@ public static interface ClockListener {
 
     }
 
-    public static interface Invoker {
+    @Deprecated
+    public static interface Invoker extends Runnable {
 
         public void invoke();
+
+        public default void run() {
+            invoke();
+        }
 
     }