[core.room] fix in getAllEndPorts to preserve order of external ports

1 files changed, 6 insertions, 2 deletions

diff --git a/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/room/util/RoomHelpers.java b/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/room/util/RoomHelpers.java
index 2329bd72d..41fe986a2 100644
--- a/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/room/util/RoomHelpers.java
+++ b/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/room/util/RoomHelpers.java
@@ -1321,16 +1321,20 @@ public class RoomHelpers {
 	 * @param ac an {@link ActorClass}

 	 * 

 	 * @return a list of all end {@link Port}s of an {@link ActorClass}

-	 * 		with base class items firast

+	 * 		with base class items first

 	 */

 	public static List<Port> getAllEndPorts(ActorClass ac) {

 		ArrayList<Port> result = new ArrayList<Port>();

 		

 		while (ac!=null) {

 			result.addAll(0, ac.getIntPorts());

+			

+			// to preserve the order of external ports we use insertAt

+			int insertAt = 0;

 			for (ExternalPort p : ac.getExtPorts()) {

-				result.add(0, p.getIfport());

+				result.add(insertAt++, p.getIfport());

 			}

+			

 			ac = ac.getBase();

 		}