From 86aa2e3ad5fe81c18c770518b0a8cf0ba1452277 Mon Sep 17 00:00:00 2001
From: Andrea Enrici <andrea.enrici@nokia.com>
Date: Mon, 30 Jun 2014 17:30:45 +0000
Subject: [PATCH] Definitively corrected the bug concerning memory id vs hwa id
by assigning a different id to the tml event mapping artifact
---
modeling/SmartCardProtocol.xml | 2 +-
src/ui/TGComponentManager.java | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/modeling/SmartCardProtocol.xml b/modeling/SmartCardProtocol.xml
index 432a5e534b..44e3c33409 100755
--- a/modeling/SmartCardProtocol.xml
+++ b/modeling/SmartCardProtocol.xml
@@ -6809,7 +6809,7 @@ On prend b=1 comme exemple
<Modeling type="TML Architecture" nameTab="Mapping2" >
<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="1400" minY="10" maxY="900" attributes="0" masterClockFrequency="200" >
-<COMPONENT type="1106" id="1675" >
+<COMPONENT type="1105" id="1675" >
<cdparam x="290" y="308" />
<sizeparam width="189" height="131" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
diff --git a/src/ui/TGComponentManager.java b/src/ui/TGComponentManager.java
index 0b3033725e..0dda4e969c 100755
--- a/src/ui/TGComponentManager.java
+++ b/src/ui/TGComponentManager.java
@@ -233,13 +233,13 @@ public class TGComponentManager {
public static final int TMLARCHI_ARTIFACT = 1101;
public static final int TMLARCHI_BUSNODE = 1102;
public static final int TMLARCHI_COMMUNICATION_ARTIFACT = 1103;
- public static final int TMLARCHI_EVENT_ARTIFACT = 1104;
- public static final int TMLARCHI_HWANODE = 1105;
- public static final int TMLARCHI_MEMORYNODE = 1106;
- public static final int TMLARCHI_BRIDGENODE = 1107;
- public static final int TMLARCHI_DMANODE = 1108;
- public static final int TMLARCHI_CPNODE = 1109;
-
+ public static final int TMLARCHI_HWANODE = 1104;
+ public static final int TMLARCHI_MEMORYNODE = 1105;
+ public static final int TMLARCHI_BRIDGENODE = 1106;
+ public static final int TMLARCHI_DMANODE = 1107;
+ public static final int TMLARCHI_CPNODE = 1108;
+ public static final int TMLARCHI_EVENT_ARTIFACT = 1109;
+
public static final int TMLCTD_CCOMPONENT = 1200;
public static final int TMLCTD_CPORT = 1201;
public static final int TMLCTD_PCOMPONENT = 1202;
--
GitLab