diff --git a/src/main/java/tmltranslator/TMLTask.java b/src/main/java/tmltranslator/TMLTask.java index 783e67b2cded5b9a8a8bb97d557e6d07a5962f5f..0b772481a86382afd2f8bc881384d83b2df89765 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 c32457004d763b90b8e498c5328f9bee26e0f2a8..26fb0b3498a57b1adac1ecb71c1bac07066973e8 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 5e401b9a6c891a5bfef9a811ece4346ae617240d..cfb54ea77f2956c68989d45fe59b6839a2951390 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 ) {