From bfbfa57722a621106d9db0ed2b662822c088eb8a Mon Sep 17 00:00:00 2001
From: Ludovic Apvrille <ludovic.apvrille@telecom-paristech.fr>
Date: Tue, 24 Feb 2015 09:40:23 +0000
Subject: [PATCH] Update on jsoup
---
src/tmltranslator/TMLMapping.java | 5 +++--
src/ttool.txt | 1 +
src/ui/GTMLModeling.java | 2 ++
src/ui/tmldd/TMLArchiPortArtifact.java | 25 ++++++++++++++++++++++++-
4 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/src/tmltranslator/TMLMapping.java b/src/tmltranslator/TMLMapping.java
index 3285c11dc2..755e17a9ad 100755
--- a/src/tmltranslator/TMLMapping.java
+++ b/src/tmltranslator/TMLMapping.java
@@ -589,7 +589,6 @@ public class TMLMapping {
}
return list;
-
}
public TMLMapping cloneMappingArchitecture() {
@@ -606,6 +605,8 @@ public class TMLMapping {
public void removeForksAndJoins() {
- tmlm.removeForksAndJoins();
+ // Remove the CPLib with new tasks, channels, HW components
+
}
+
}
diff --git a/src/ttool.txt b/src/ttool.txt
index 26029e3461..0c2261a687 100755
--- a/src/ttool.txt
+++ b/src/ttool.txt
@@ -1 +1,2 @@
Main-Class: Main
+Class-Path: ./jsoup-1.8.1.jar
diff --git a/src/ui/GTMLModeling.java b/src/ui/GTMLModeling.java
index cb6ab53790..8374f2c96c 100755
--- a/src/ui/GTMLModeling.java
+++ b/src/ui/GTMLModeling.java
@@ -2892,6 +2892,7 @@ public class GTMLModeling {
while(iterator.hasNext()) {
tgc = (TGComponent)(iterator.next());
+ //TraceManager.addDev("---------------- tgc=" + tgc);
if (tgc instanceof TMLArchiCPNode) {
cp = (TMLArchiCPNode)tgc;
TMLCPLib tmlcplib = new TMLCPLib(tgc.getName(), tgc);
@@ -2902,6 +2903,7 @@ public class GTMLModeling {
for (TMLArchiPortArtifact artifact: cp.getPortArtifactList()) {
TMLCPLibArtifact arti = new TMLCPLibArtifact(artifact.getName(), artifact, artifact.getValue(), artifact.getPortName(), artifact.getMappedMemory(), artifact.getPriority() );
tmlcplib.addArtifact(arti);
+ //TraceManager.addDev("Adding CP artifact:" + arti);
}
}
}
diff --git a/src/ui/tmldd/TMLArchiPortArtifact.java b/src/ui/tmldd/TMLArchiPortArtifact.java
index cb776a3cfa..9ee50eaa4c 100644
--- a/src/ui/tmldd/TMLArchiPortArtifact.java
+++ b/src/ui/tmldd/TMLArchiPortArtifact.java
@@ -134,6 +134,29 @@ public class TMLArchiPortArtifact extends TGCWithoutInternalComponent implements
g.drawString(typeName, x + textX , y + textY + 20);
g.setFont(f);
+ // Link to selected memory
+ Color c = g.getColor();
+ if (c == ColorManager.POINTER_ON_ME_0) {
+ TDiagramPanel tdp = getTDiagramPanel();
+ TGComponent tgc;
+ if (tdp != null) {
+ if (mappedMemory.length() > 0) {
+ ListIterator iterator = tdp.getComponentList().listIterator();
+ while(iterator.hasNext()) {
+ tgc = (TGComponent)(iterator.next());
+ if (tgc instanceof TMLArchiMemoryNode) {
+ //TraceManager.addDev("Testing |" + tgc.getName() + "| vs | " + s + "|");
+ if (tgc.getName().compareTo(mappedMemory) == 0) {
+ //TraceManager.addDev("Ok");
+ GraphicLib.dashedLine(g, getX() + getWidth()/2, getY() + getHeight()/2, tgc.getX() + tgc.getWidth()/2, tgc.getY() + tgc.getHeight()/2);
+ }
+ }
+ }
+ }
+ }
+ }
+
+
}
public void setValue(String val, Graphics g) {
@@ -339,7 +362,7 @@ public class TMLArchiPortArtifact extends TGCWithoutInternalComponent implements
}
public String getMappedMemory() {
- return mappedMemory;
+ return mappedMemory;
}
}
--
GitLab