debud addition spies

src/ui/AvatarDeploymentPanelTranslator.java

@@ -76,15 +76,15 @@ public class AvatarDeploymentPanelTranslator {
 
 	public AvatarDeploymentPanelTranslator(ADDDiagramPanel _avatarddDiagramPanel) {
 		tgcComponents = _avatarddDiagramPanel.getComponentList();
-
+		
 		avatarComponents = new LinkedList<AvatarComponent>();
 		avatarConnectors = new LinkedList<AvatarConnector>();
 		avatarMappedObject = new LinkedList<AvatarMappedObject>();
 
-		MakeListOfComponentAndMappedObject();
+		MakeListOfComponentAndMappedObject(_avatarddDiagramPanel);
 	}
 
-	private void MakeListOfComponentAndMappedObject() {
+	private void MakeListOfComponentAndMappedObject(ADDDiagramPanel avatarddDiagramPanel) {
 
 		Map<TGComponent, AvatarComponent> avatarMap = new HashMap<TGComponent, AvatarComponent>();
 
@@ -267,24 +267,37 @@ public class AvatarDeploymentPanelTranslator {
 		
 		
 		for (TGComponent dp : tgcComponents) {
-			
+		  
 			if (dp instanceof ADDConnector) {
+System.out.println("@@@@@@@CONNECTOR FOUND@@@@@@@");	
 				ADDConnector connector = (ADDConnector) dp;
-				ADDConnectingPoint connectingPoint1 = (ADDConnectingPoint) connector.get_p1();
-				ADDConnectingPoint connectingPoint2 = (ADDConnectingPoint) connector.get_p2();			
+				//ADDConnectingPoint connectingPoint1 = (ADDConnectingPoint) connector.get_p1();
+				//ADDConnectingPoint connectingPoint2 = (ADDConnectingPoint) connector.get_p2();			
+				TGConnectingPoint connectingPoint1 =  connector.get_p1();
+				TGConnectingPoint connectingPoint2 =  connector.get_p2();	
+	
+				TGComponent owner_p1 = avatarddDiagramPanel.getComponentToWhichBelongs(connectingPoint1);
+				TGComponent owner_p2 = avatarddDiagramPanel.getComponentToWhichBelongs(connectingPoint2);
 
-				TGComponent owner_p1 = connectingPoint1.getOwner();
-				TGComponent owner_p2 = connectingPoint2.getOwner();
+System.out.println("@@@@@@@@@@@@@"+owner_p1.getName()+" connected to "+owner_p2.getName());	
 
-				AvatarComponent avowner_p1 = avatarMap.get(owner_p1);
+				AvatarComponent avowner_p1 = avatarMap.get(owner_p1);	
 				AvatarComponent avowner_p2 = avatarMap.get(owner_p2);
 
+				if(avowner_p1 instanceof AvatarCPU)
+				    System.out.println("@@@@@@IS A CPU @@@@@@@");  
+				if(avowner_p1 instanceof AvatarRAM)
+				    System.out.println("@@@@@@IS A RAM @@@@@@@");  
+				//create Avatar connecting points
+
 				AvatarConnectingPoint avconnectingPoint1 = new AvatarConnectingPoint(avowner_p1);
 				AvatarConnectingPoint avconnectingPoint2 = new AvatarConnectingPoint(avowner_p2);
 				boolean spy = connector.hasASpy();
 				int monitored = 0;
-				if (spy == true)
-					monitored = 1;
+				if (spy == true){
+					monitored = 1; 
+					System.out.println("@@@@@@HAS A SPY @@@@@@@");  
+				}
 				AvatarConnector avconnector = new AvatarConnector(avconnectingPoint1, avconnectingPoint2, monitored);
 
 				avatarConnectors.add(avconnector);