diff --git a/src/tmltranslator/TMLModeling.java b/src/tmltranslator/TMLModeling.java
index 3ab1d08bda660cfa1579c7a52e12322c0dde1646..21b33802335505ae9f57f804717a85802c580251 100755
--- a/src/tmltranslator/TMLModeling.java
+++ b/src/tmltranslator/TMLModeling.java
@@ -637,7 +637,6 @@ public class TMLModeling {
}
String channelName=secChannelMap.get(attr.getName());
if (channelName!=null){
- System.out.println("CHANNEL FOUND "+channelName);
channel = getChannelByName(channelName);
if (channel!=null){
for (TMLCPrimitivePort port:channel.ports){
@@ -698,7 +697,6 @@ public class TMLModeling {
}
}
String channelName=secChannelMap.get(attr.getName());
- System.out.println("CHANNEL FOUND "+channelName);
if (channelName!=null){
channel = getChannelByName(channelName);
if (channel!=null){
@@ -730,7 +728,6 @@ public class TMLModeling {
}
public void backtraceAuthenticity(LinkedList<String> satisfiedAuthenticity, LinkedList<String> satisfiedWeakAuthenticity,LinkedList<String> nonSatisfiedAuthenticity, String mappingName){
for (String s: satisfiedAuthenticity){
- System.out.println("authenticity" +s);
String signalName = s.split("__chData")[0];
for (TMLTask t: getTasks()){
if (signalName.contains(t.getName())){
@@ -785,17 +782,17 @@ public class TMLModeling {
signalName = signalName.replace(t.getName()+"__","");
}
}
- System.out.println("auth on "+signalName);
String channelName=secChannelMap.get(signalName);
- System.out.println("auth channel "+channelName);
- channel = getChannelByName(channelName);
- if (channel!=null){
- for (TMLCPrimitivePort port:channel.ports){
- if (port.checkAuth){
- port.checkSecStrongAuthStatus = 2;
- port.secName= signalName;
+ if (channelName!=null){
+ channel = getChannelByName(channelName);
+ if (channel!=null){
+ for (TMLCPrimitivePort port:channel.ports){
+ if (port.checkAuth){
+ port.checkSecStrongAuthStatus = 2;
+ port.secName= signalName;
+ }
}
- }
+ }
}
}
for (String s: satisfiedWeakAuthenticity){
@@ -853,14 +850,16 @@ public class TMLModeling {
}
}
String channelName=secChannelMap.get(signalName);
- channel = getChannelByName(channelName);
- if (channel!=null){
- for (TMLCPrimitivePort port:channel.ports){
- if (port.checkAuth){
- port.checkSecWeakAuthStatus = 2;
- port.secName= signalName;
+ if (channelName!=null){
+ channel = getChannelByName(channelName);
+ if (channel!=null){
+ for (TMLCPrimitivePort port:channel.ports){
+ if (port.checkAuth){
+ port.checkSecWeakAuthStatus = 2;
+ port.secName= signalName;
+ }
}
- }
+ }
}
}
for (String s: nonSatisfiedAuthenticity){
@@ -919,17 +918,18 @@ public class TMLModeling {
}
String channelName=secChannelMap.get(signalName);
if (channelName!=null){
- channel = getChannelByName(channelName);
- if (channel!=null){
- for (TMLCPrimitivePort port:channel.ports){
- if (port.checkAuth){
- port.checkSecStrongAuthStatus = 3;
- port.secName= signalName;
+ channel = getChannelByName(channelName);
+ if (channel!=null){
+ for (TMLCPrimitivePort port:channel.ports){
+ if (port.checkAuth){
+ port.checkSecStrongAuthStatus = 3;
+ port.secName= signalName;
+ }
}
- }
- }
+ }
}
}
+ return;
}
public void clearBacktracing(){
for (TMLChannel channel: getChannels()){
diff --git a/src/tmltranslator/toavatar/TML2Avatar.java b/src/tmltranslator/toavatar/TML2Avatar.java
index f263988fa9c01999f83397a2a8e33600bd946b01..96e8757254dffbcabfb622ead6581077a73b3dd6 100644
--- a/src/tmltranslator/toavatar/TML2Avatar.java
+++ b/src/tmltranslator/toavatar/TML2Avatar.java
@@ -95,7 +95,6 @@ public class TML2Avatar {
List<String> allStates;
public TML2Avatar(TMLMapping tmlmap) {
this.tmlmap = tmlmap;
- System.out.println(tmlmap.mappedcommelts);
this.tmlmodel = tmlmap.getTMLModeling();
allStates = new ArrayList<String>();
attrsToCheck=new ArrayList<String>();
@@ -1212,7 +1211,6 @@ public class TML2Avatar {
//Add authenticity pragmas
for (String s: signalAuthOriginMap.keySet()){
- System.out.println("authe " + s);
if (signalAuthDestMap.containsKey(s)){
AvatarPragmaAuthenticity pragma = new AvatarPragmaAuthenticity(s, signalAuthOriginMap.get(s).getReferenceObject(), signalAuthOriginMap.get(s), signalAuthDestMap.get(s));
avspec.addPragma(pragma);
@@ -1226,7 +1224,21 @@ public class TML2Avatar {
for (TMLChannel channel:tmlmodel.getChannels()){
if (channel.isBasicChannel()){
AvatarRelation ar= new AvatarRelation(channel.getName(), taskBlockMap.get(channel.getOriginTask()), taskBlockMap.get(channel.getDestinationTask()), channel.getReferenceObject());
- ar.setPrivate(originDestMap.get(channel.getOriginTask().getName()+"__"+channel.getDestinationTask().getName())==1);
+ LinkedList<HwCommunicationNode> path =tmlmap.findNodesForElement(channel);
+ if (path.size()!=0){
+ // System.out.println(path);
+ ar.setPrivate(true);
+ for (HwCommunicationNode node:path){
+ if (node instanceof HwBus){
+ if (((HwBus) node).privacy ==0){
+ ar.setPrivate(false);
+ }
+ }
+ }
+ }
+ else {
+ ar.setPrivate(originDestMap.get(channel.getOriginTask().getName()+"__"+channel.getDestinationTask().getName())==1);
+ }
//Find in signal
List<AvatarSignal> sig1 = new ArrayList<AvatarSignal>();
List<AvatarSignal> sig2 = new ArrayList<AvatarSignal>();
diff --git a/src/ui/GTMLModeling.java b/src/ui/GTMLModeling.java
index f97abeb651d6e22f53456da3cda931940ea4431f..f3d995223fe984e589dc3a45e6adaca35a5ea3de 100755
--- a/src/ui/GTMLModeling.java
+++ b/src/ui/GTMLModeling.java
@@ -1946,7 +1946,6 @@ public class GTMLModeling {
}
//add sec pattern
if (securityPatterns.get(((TMLADWriteChannel)tgc).securityContext)!=null){
- System.out.println("Security context "+((TMLADWriteChannel)tgc).securityContext+"!");
tmlwritechannel.securityPattern= securityPatterns.get(((TMLADWriteChannel)tgc).securityContext);
int cur = Integer.valueOf(modifyString(((TMLADWriteChannel)tgc).getSamplesValue()));
int add = Integer.valueOf(tmlwritechannel.securityPattern.MACSize);
@@ -2135,11 +2134,9 @@ public class GTMLModeling {
if (!makeTMLModeling()) {
return null;
}
- System.out.println("security patterns " + tmlm.securityPatterns);
TraceManager.addDev("Making mapping");
makeMapping(); //fills map
// map.securityPatterns.addAll(securityPatterns.keySet());
- System.out.println("security patterns " + securityPatterns);
TraceManager.addDev("Making TMLCPLib");
makeTMLCPLib();
diff --git a/src/ui/GTURTLEModeling.java b/src/ui/GTURTLEModeling.java
index 8d3f7e3149debe4191535a0d750475c83fc2a712..bfa467b97b536138f85c3516653a14a6078eba22 100755
--- a/src/ui/GTURTLEModeling.java
+++ b/src/ui/GTURTLEModeling.java
@@ -641,6 +641,13 @@ public class GTURTLEModeling {
t2a = new TML2Avatar(tmap);
avatarspec = t2a.generateAvatarSpec(loopLimit);
}
+ else if (tmlm!=null){
+ //Generate default mapping
+ tmap = tmlm.getDefaultMapping();
+ tmap.setTMLDesignPanel((TMLComponentDesignPanel)mgui.getCurrentTURTLEPanel());
+ t2a=new TML2Avatar(tmap);
+ avatarspec = t2a.generateAvatarSpec(loopLimit);
+ }
else if (avatarspec == null){
return false;
}
diff --git a/src/ui/MainGUI.java b/src/ui/MainGUI.java
index be21a47f40f96d35c0a788a0fdd5354b036ac2d3..68dee3080f94dc4af39937849ca1f41e75c1e772 100755
--- a/src/ui/MainGUI.java
+++ b/src/ui/MainGUI.java
@@ -3770,10 +3770,12 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
gtm.getTMLMapping().getTMLModeling().backtrace(pvoa, getTabName(tp));
gtm.getTML2Avatar().backtraceReachability(pvoa.getReachableEvents(), pvoa.getNonReachableEvents());
gtm.getTMLMapping().getTMLModeling().backtraceAuthenticity(pvoa.getSatisfiedAuthenticity(), pvoa.getSatisfiedWeakAuthenticity(), pvoa.getNonSatisfiedAuthenticity(), getTabName(tp));
- System.out.println("backtracing finished");
}
else if (tp instanceof TMLComponentDesignPanel){
-
+ gtm.getTMLMapping().getTMLModeling().clearBacktracing();
+ gtm.getTMLMapping().getTMLModeling().backtrace(pvoa, "Default Mapping");
+ gtm.getTML2Avatar().backtraceReachability(pvoa.getReachableEvents(), pvoa.getNonReachableEvents());
+ gtm.getTMLMapping().getTMLModeling().backtraceAuthenticity(pvoa.getSatisfiedAuthenticity(), pvoa.getSatisfiedWeakAuthenticity(), pvoa.getNonSatisfiedAuthenticity(), "Default Mapping");
}
return;
}