From 58555de97c6d5b82f4481b437a05b99a67fed760 Mon Sep 17 00:00:00 2001
From: Ludovic Apvrille <ludovic.apvrille@telecom-paristech.fr>
Date: Thu, 7 Feb 2019 13:14:39 +0100
Subject: [PATCH] Adding string op in TMLTask
---
src/main/java/tmltranslator/TMLTask.java | 15 ++++++++++++---
src/main/java/ui/GTMLModeling.java | 4 +++-
src/main/java/ui/tmldd/TMLArchiArtifact.java | 4 ++++
3 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/main/java/tmltranslator/TMLTask.java b/src/main/java/tmltranslator/TMLTask.java
index 783e67b2cd..0b772481a8 100755
--- a/src/main/java/tmltranslator/TMLTask.java
+++ b/src/main/java/tmltranslator/TMLTask.java
@@ -61,7 +61,8 @@ public class TMLTask extends TMLElement {
private Set<TMLChannel> readTMLChannelsList;
private Set<TMLChannel> writeTMLChannelsList;
private Set<TMLEvent> eventsList;
- private String operationType;
+ private int operationType;
+ private String operation;
private boolean isAttacker;
public TMLTask(String name, Object referenceToClass, Object referenceToActivityDiagram) {
@@ -374,14 +375,22 @@ public class TMLTask extends TMLElement {
return new ArrayList<TMLEvent>(eventsList);
}
- public void addOperationType(String _operationType) {
+ public void addOperationType(int _operationType) {
operationType = _operationType;
}
- public String getOperationType() {
+ public int getOperationType() {
return operationType;
}
+ public void addOperation(String _operation) {
+ operation = _operation;
+ }
+
+ public String getOperation() {
+ return operation;
+ }
+
public void removeEmptyInfiniteLoop() {
activity.removeEmptyInfiniteLoop();
}
diff --git a/src/main/java/ui/GTMLModeling.java b/src/main/java/ui/GTMLModeling.java
index c32457004d..26fb0b3498 100644
--- a/src/main/java/ui/GTMLModeling.java
+++ b/src/main/java/ui/GTMLModeling.java
@@ -3858,6 +3858,7 @@ public class GTMLModeling {
s = artifact.getReferenceTaskName();
ArchUnitMEC mec = artifact.getArchUnitMEC();
int operationType = artifact.getOperationType();
+ String operation = artifact.getOperation();
//TraceManager.addDev("1) Trying to get task named:" + s);
s = s.replaceAll("\\s", "");
//TraceManager.addDev("2) Trying to get task named:" + s);
@@ -3865,9 +3866,10 @@ public class GTMLModeling {
//TraceManager.addDev("3) Trying to get task named:" + s);
task = tmlm.getTMLTaskByName(s);
if (task != null) {
- if (operationType != -1) {
+ if (operationType != -1) {
task.addOperationType(operationType);
}
+ task.addOperation(operation);
node.addMECToHwExecutionNode(mec);
map.addTaskToHwExecutionNode(task, (HwExecutionNode) node);
} else {
diff --git a/src/main/java/ui/tmldd/TMLArchiArtifact.java b/src/main/java/ui/tmldd/TMLArchiArtifact.java
index 5e401b9a6c..cfb54ea77f 100755
--- a/src/main/java/ui/tmldd/TMLArchiArtifact.java
+++ b/src/main/java/ui/tmldd/TMLArchiArtifact.java
@@ -347,6 +347,10 @@ public class TMLArchiArtifact extends TGCWithoutInternalComponent implements Swa
return "Priority = " + priority;
}
+ public String getOperation() {
+ return operation;
+ }
+
public int getOperationType() {
if( fatherArchUnitMECType instanceof FepMEC ) {
--
GitLab