| commit | 74d598fc3e34b0a42dfc859c008e21f39470d1fd | [log] [tgz] |
|---|---|---|
| author | Alois Zoitl <alois.zoitl@gmx.at> | Mon Jan 04 16:10:44 2021 +0100 |
| committer | Bianca Wiesmayr <bianca.wiesmayr@jku.at> | Thu Jan 07 06:06:33 2021 -0500 |
| tree | afbc3eb42353095cf6317fc8751451053c16c343 | |
| parent | 3d1b59423b5d3a6c0ad0be908cd65343c0891b8b [diff] |
[563528] Fixed fanned out data connections forte ng exporter was incrementing the wrong counter for fanned out data connections. This resulted in an empty fanned out data connection list and wrong numbers in the fanned out event connection list. Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=563528 Change-Id: I1cce5afa27f15bf2d7f078954cf7cf9e04193988 Signed-off-by: Alois Zoitl <alois.zoitl@gmx.at>
diff --git a/plugins/org.eclipse.fordiac.ide.export.forte_ng/src/org/eclipse/fordiac/ide/export/forte_ng/composite/CompositeFBImplTemplate.xtend b/plugins/org.eclipse.fordiac.ide.export.forte_ng/src/org/eclipse/fordiac/ide/export/forte_ng/composite/CompositeFBImplTemplate.xtend index e26e344..7fe2389 100644 --- a/plugins/org.eclipse.fordiac.ide.export.forte_ng/src/org/eclipse/fordiac/ide/export/forte_ng/composite/CompositeFBImplTemplate.xtend +++ b/plugins/org.eclipse.fordiac.ide.export.forte_ng/src/org/eclipse/fordiac/ide/export/forte_ng/composite/CompositeFBImplTemplate.xtend
@@ -170,7 +170,7 @@ errors.add(" - " + name + " FORTE does currently not allow that a data a composite's data connection may be connected to several data outputs of the composite FB."); //$NON-NLS-1$ } fannedOutConns.append(fannedConn.genFannedOutConnString(dataConnNumber)) - fannedOutEventConns++ + fannedOutDataConns++ } } dataConnNumber++; @@ -196,7 +196,7 @@ } def private getPrimaryDataConn(DataConnection dataConn) { - //if from the source one connection is target to the interface of the CFB we have to take these first + //if from the source one connection is target to the interface of the CFB we have to take this first for (Connection dc : dataConn.getSource().getOutputConnections()) { if (dc.hasCFBInterfaceDestination) { return dc
diff --git a/plugins/org.eclipse.fordiac.ide.export.forte_ng/xtend-gen/org/eclipse/fordiac/ide/export/forte_ng/composite/CompositeFBImplTemplate.java b/plugins/org.eclipse.fordiac.ide.export.forte_ng/xtend-gen/org/eclipse/fordiac/ide/export/forte_ng/composite/CompositeFBImplTemplate.java index 8dbcba7..a34f88a 100644 --- a/plugins/org.eclipse.fordiac.ide.export.forte_ng/xtend-gen/org/eclipse/fordiac/ide/export/forte_ng/composite/CompositeFBImplTemplate.java +++ b/plugins/org.eclipse.fordiac.ide.export.forte_ng/xtend-gen/org/eclipse/fordiac/ide/export/forte_ng/composite/CompositeFBImplTemplate.java
@@ -393,7 +393,7 @@ _errors.add(_plus_3); } fannedOutConns.append(this.genFannedOutConnString(fannedConn, this.dataConnNumber)); - this.fannedOutEventConns++; + this.fannedOutDataConns++; } } }