From 1bdbcd4302e60a9817098d2c161eeaddb2509eb4 Mon Sep 17 00:00:00 2001
From: Andrea Enrici <andrea.enrici@nokia.com>
Date: Fri, 13 Jun 2014 13:35:12 +0000
Subject: [PATCH] Adding all files that make use of methos setStartName()
---
src/ui/tmlcp/TMLCPRefCP.java | 4 ++--
src/ui/tmlcp/TMLCPRefSD.java | 8 ++++----
src/ui/tmlsd/TMLSDControllerInstance.java | 8 ++++++--
src/ui/tmlsd/TMLSDInstance.java | 4 ++--
src/ui/tmlsd/TMLSDStorageInstance.java | 8 ++++++--
src/ui/tmlsd/TMLSDTransferInstance.java | 8 ++++++--
6 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/src/ui/tmlcp/TMLCPRefCP.java b/src/ui/tmlcp/TMLCPRefCP.java
index e28e62bad1..b8f601e851 100755
--- a/src/ui/tmlcp/TMLCPRefCP.java
+++ b/src/ui/tmlcp/TMLCPRefCP.java
@@ -183,11 +183,11 @@ public class TMLCPRefCP extends TGCOneLineText {
//When the name of a refToCP is changed, the connector name must be updated accordingly
if( connectingPoint[0].getReferenceToConnector() != null ) {
TGConnectorTMLCP connector = (TGConnectorTMLCP) connectingPoint[0].getReferenceToConnector();
- connector.changeEndName(s);
+ connector.setEndName(s);
TraceManager.addDev( connector.getName() );
if( connectingPoint[1].getReferenceToConnector() != null ) {
connector = (TGConnectorTMLCP) connectingPoint[1].getReferenceToConnector();
- connector.changeStartName(s);
+ connector.setStartName(s);
TraceManager.addDev( connector.getName() );
}
}
diff --git a/src/ui/tmlcp/TMLCPRefSD.java b/src/ui/tmlcp/TMLCPRefSD.java
index ce9d00b3ef..f8a331795f 100755
--- a/src/ui/tmlcp/TMLCPRefSD.java
+++ b/src/ui/tmlcp/TMLCPRefSD.java
@@ -187,12 +187,12 @@ public class TMLCPRefSD extends TGCOneLineText {
//When the name of a refToSD is changed, the connector name must be updated accordingly
if( connectingPoint[0].getReferenceToConnector() != null ) {
TGConnectorTMLCP connector = (TGConnectorTMLCP) connectingPoint[0].getReferenceToConnector();
- connector.changeEndName(s);
- TraceManager.addDev( connector.getName() );
+ connector.setEndName(s);
+ //TraceManager.addDev( connector.getName() );
if( connectingPoint[1].getReferenceToConnector() != null ) {
connector = (TGConnectorTMLCP) connectingPoint[1].getReferenceToConnector();
- connector.changeStartName(s);
- TraceManager.addDev( connector.getName() );
+ connector.setStartName(s);
+ //TraceManager.addDev( connector.getName() );
}
}
/*if( refToSD != null ) {
diff --git a/src/ui/tmlsd/TMLSDControllerInstance.java b/src/ui/tmlsd/TMLSDControllerInstance.java
index 3c1af75ab0..2f22a5f06a 100755
--- a/src/ui/tmlsd/TMLSDControllerInstance.java
+++ b/src/ui/tmlsd/TMLSDControllerInstance.java
@@ -127,11 +127,11 @@ public class TMLSDControllerInstance extends TMLSDInstance implements SwallowTGC
if( connectingPoint[i].getReferenceToConnector() != null ) {
TGConnectorMessageAsyncTMLSD connector = (TGConnectorMessageAsyncTMLSD) connectingPoint[i].getReferenceToConnector();
if( connectingPoint[i].isSource() ) {
- connector.changeStartName(s);
+ connector.setStartName(s);
TraceManager.addDev( connector.getConnectorName() );
}
else {
- connector.changeEndName(s);
+ connector.setEndName(s);
TraceManager.addDev( connector.getConnectorName() );
}
}
@@ -145,4 +145,8 @@ public class TMLSDControllerInstance extends TMLSDInstance implements SwallowTGC
@Override public int getType() {
return TGComponentManager.TMLSD_CONTROLLER_INSTANCE;
}
+
+ public String getInstanceType() {
+ return "CONTROLLER";
+ }
} //End of class
diff --git a/src/ui/tmlsd/TMLSDInstance.java b/src/ui/tmlsd/TMLSDInstance.java
index 352144269d..fe3acf5209 100755
--- a/src/ui/tmlsd/TMLSDInstance.java
+++ b/src/ui/tmlsd/TMLSDInstance.java
@@ -211,11 +211,11 @@ public abstract class TMLSDInstance extends TGCWithInternalComponent implements
if( connectingPoint[i].getReferenceToConnector() != null ) {
TGConnectorMessageAsyncTMLSD connector = (TGConnectorMessageAsyncTMLSD) connectingPoint[i].getReferenceToConnector();
if( connectingPoint[i].isSource() ) {
- connector.changeStartName(s);
+ connector.setStartName(s);
TraceManager.addDev( connector.getConnectorName() );
}
else {
- connector.changeEndName(s);
+ connector.setEndName(s);
TraceManager.addDev( connector.getConnectorName() );
}
}
diff --git a/src/ui/tmlsd/TMLSDStorageInstance.java b/src/ui/tmlsd/TMLSDStorageInstance.java
index d428ada317..83258dc78c 100755
--- a/src/ui/tmlsd/TMLSDStorageInstance.java
+++ b/src/ui/tmlsd/TMLSDStorageInstance.java
@@ -126,11 +126,11 @@ public class TMLSDStorageInstance extends TMLSDInstance implements SwallowTGComp
if( connectingPoint[i].getReferenceToConnector() != null ) {
TGConnectorMessageAsyncTMLSD connector = (TGConnectorMessageAsyncTMLSD) connectingPoint[i].getReferenceToConnector();
if( connectingPoint[i].isSource() ) {
- connector.changeStartName(s);
+ connector.setStartName(s);
TraceManager.addDev( connector.getConnectorName() );
}
else {
- connector.changeEndName(s);
+ connector.setEndName(s);
TraceManager.addDev( connector.getConnectorName() );
}
}
@@ -144,4 +144,8 @@ public class TMLSDStorageInstance extends TMLSDInstance implements SwallowTGComp
@Override public int getType() {
return TGComponentManager.TMLSD_STORAGE_INSTANCE;
}
+
+ public String getInstanceType() {
+ return "STORAGE";
+ }
} //End of class
diff --git a/src/ui/tmlsd/TMLSDTransferInstance.java b/src/ui/tmlsd/TMLSDTransferInstance.java
index 083190899c..b3fbf39192 100755
--- a/src/ui/tmlsd/TMLSDTransferInstance.java
+++ b/src/ui/tmlsd/TMLSDTransferInstance.java
@@ -127,11 +127,11 @@ public class TMLSDTransferInstance extends TMLSDInstance implements SwallowTGCom
if( connectingPoint[i].getReferenceToConnector() != null ) {
TGConnectorMessageAsyncTMLSD connector = (TGConnectorMessageAsyncTMLSD) connectingPoint[i].getReferenceToConnector();
if( connectingPoint[i].isSource() ) {
- connector.changeStartName(s);
+ connector.setStartName(s);
TraceManager.addDev( connector.getConnectorName() );
}
else {
- connector.changeEndName(s);
+ connector.setEndName(s);
TraceManager.addDev( connector.getConnectorName() );
}
}
@@ -145,4 +145,8 @@ public class TMLSDTransferInstance extends TMLSDInstance implements SwallowTGCom
@Override public int getType() {
return TGComponentManager.TMLSD_TRANSFER_INSTANCE;
}
+
+ public String getInstanceType() {
+ return "TRANSFER";
+ }
} //End of class
--
GitLab