Skip to content

Commit b965b6d

Browse files
committed
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
1 parent bfc9d38 commit b965b6d

File tree

5 files changed

+13
-7
lines changed

5 files changed

+13
-7
lines changed

VRL/src/eu/mihosoft/vrl/lang/visual/ControlFlowUtils.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -593,10 +593,10 @@ public static Collection<DefaultMethodRepresentation> getInvocationList(
593593
ControlFlowConnector stopConnector =
594594
ControlFlowUtils.getStopConnector(canvas);
595595

596-
Collection<ControlFlowConnection> connectios =
596+
Collection<ControlFlowConnection> connections =
597597
getPath(startConnector, stopConnector);
598598

599-
return getPathAsMethodList(connectios);
599+
return getPathAsMethodList(connections);
600600
}
601601

602602
/**

VRL/src/eu/mihosoft/vrl/reflection/DefaultMethodRepresentation.java

+1
Original file line numberDiff line numberDiff line change
@@ -804,6 +804,7 @@ public Object invokeAsCallParentNoNewThread()
804804
*
805805
* @param enableAlreadyRunningMessages defines whether to show error
806806
* messages if the method is already running
807+
* @throws java.lang.reflect.InvocationTargetException
807808
*/
808809
public Object invokeAsCallParentNoNewThread(
809810
boolean enableAlreadyRunningMessages)

VRL/src/eu/mihosoft/vrl/reflection/DefaultObjectRepresentation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1312,7 +1312,7 @@ public ArrayList<MethodIdentifier> getMethodOrder() {
13121312
}
13131313

13141314
/**
1315-
* Used for visual invocation.
1315+
* Returns the visually defined invocation list.
13161316
*
13171317
* @return
13181318
*/

VRL/src/eu/mihosoft/vrl/reflection/VisualObjectInspector.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -498,10 +498,8 @@ private DefaultObjectRepresentation replaceInstance(
498498

499499
// get param value of reference method
500500
if (hasNonCustomReferenceMethod) {
501-
// returnValue = oRep.getReferenceMethod().
502-
// getDescription().getReturnValue();
503-
504-
returnValue = null;
501+
returnValue = oRep.getReferenceMethod().
502+
getDescription().getReturnValue();
505503
}
506504

507505
oRep.setDescription(oDesc);

VRL/src/eu/mihosoft/vrl/resources/changelog/changelog.txt

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
-----------------------------------------------
2+
Version: v0.4.4.0.0
3+
Date: Mon, 29 Oct 2018 14:48:57 +0100
4+
-----------------------------------------------
5+
6+
deployment prepared for release
7+
18
-----------------------------------------------
29
Version: v0.4.3.2.4
310
Date: Sat, 21 Apr 2018 19:42:27 +0200

0 commit comments

Comments
 (0)