Fix for issue #78:

- non-custom reference method (this) returns the correct object instead of null if the object is provided by a regular object method instead of a visual reference see #78
VRL-Studio · Nov 27, 2018 · b965b6d · b965b6d
1 parent bfc9d38
commit b965b6d
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/VRL/src/eu/mihosoft/vrl/lang/visual/ControlFlowUtils.java b/VRL/src/eu/mihosoft/vrl/lang/visual/ControlFlowUtils.java
@@ -593,10 +593,10 @@ public static Collection<DefaultMethodRepresentation> getInvocationList(
         ControlFlowConnector stopConnector =
                 ControlFlowUtils.getStopConnector(canvas);
 
-        Collection<ControlFlowConnection> connectios =
+        Collection<ControlFlowConnection> connections =
                 getPath(startConnector, stopConnector);
 
-        return getPathAsMethodList(connectios);
+        return getPathAsMethodList(connections);
     }
 
     /**

diff --git a/VRL/src/eu/mihosoft/vrl/reflection/DefaultMethodRepresentation.java b/VRL/src/eu/mihosoft/vrl/reflection/DefaultMethodRepresentation.java
@@ -804,6 +804,7 @@ public Object invokeAsCallParentNoNewThread()
      *
      * @param enableAlreadyRunningMessages defines whether to show error
      * messages if the method is already running
+     * @throws java.lang.reflect.InvocationTargetException
      */
     public Object invokeAsCallParentNoNewThread(
             boolean enableAlreadyRunningMessages)

diff --git a/VRL/src/eu/mihosoft/vrl/reflection/DefaultObjectRepresentation.java b/VRL/src/eu/mihosoft/vrl/reflection/DefaultObjectRepresentation.java
@@ -1312,7 +1312,7 @@ public ArrayList<MethodIdentifier> getMethodOrder() {
     }
 
     /**
-     * Used for visual invocation.
+     * Returns the visually defined invocation list.
      *
      * @return
      */

diff --git a/VRL/src/eu/mihosoft/vrl/reflection/VisualObjectInspector.java b/VRL/src/eu/mihosoft/vrl/reflection/VisualObjectInspector.java
@@ -498,10 +498,8 @@ private DefaultObjectRepresentation replaceInstance(
 
             // get param value of reference method
             if (hasNonCustomReferenceMethod) {
-//                returnValue = oRep.getReferenceMethod().
-//                        getDescription().getReturnValue();
-
-                returnValue = null;
+                returnValue = oRep.getReferenceMethod().
+                        getDescription().getReturnValue();
             }
 
             oRep.setDescription(oDesc);

diff --git a/VRL/src/eu/mihosoft/vrl/resources/changelog/changelog.txt b/VRL/src/eu/mihosoft/vrl/resources/changelog/changelog.txt
@@ -1,3 +1,10 @@
+-----------------------------------------------
+Version:	v0.4.4.0.0
+Date:		Mon, 29 Oct 2018 14:48:57 +0100
+-----------------------------------------------
+
+      deployment prepared for release
+
 -----------------------------------------------
 Version:	v0.4.3.2.4
 Date:		Sat, 21 Apr 2018 19:42:27 +0200
-Original file line number
+Diff line change
@@ Expand Up / @@ -1312,7 +1312,7 @@ public ArrayList<MethodIdentifier> getMethodOrder() { @@
         }
         /**
-         * Used for visual invocation.
+         * Returns the visually defined invocation list.
          *
          * @return
          */
@@ Expand Down @@