[Javanetsim-cvs] javaNetSim/guiUI LinkLayerPanel.java, 1.4, 1.5 MainScreen.java, 1.70, 1.71 SetTCPIPPropertiesDialog.java, 1.8, 1.9

[Alexander B. <da...@us...>]

Update of /cvsroot/javanetsim/javaNetSim/guiUI
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv5217/guiUI

Modified Files:
	LinkLayerPanel.java MainScreen.java 
	SetTCPIPPropertiesDialog.java 
Log Message:
Serial(FrameRelay) NICS + minor fixes in socket layer/protocol stack...

Index: MainScreen.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/guiUI/MainScreen.java,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** MainScreen.java	14 Oct 2007 22:14:52 -0000	1.70
--- MainScreen.java	15 Oct 2007 12:04:33 -0000	1.71
***************
*** 1170,1175 ****
                                      break;
                                  case core.NetworkInterface.Console:
!                                         Sim.addSerialLink(strLinkName,inNode1, strFirstNodeInterface, inNode2, strSecondNodeInterface);                                        
                                      break;    
                              }
                              
--- 1170,1178 ----
                                      break;
                                  case core.NetworkInterface.Console:
!                                         Sim.addConsoleLink(strLinkName,inNode1, strFirstNodeInterface, inNode2, strSecondNodeInterface);                                        
                                      break;    
+                                 case core.NetworkInterface.Serial:
+                                         Sim.addSerialLink(strLinkName,inNode1, strFirstNodeInterface, inNode2, strSecondNodeInterface);                                        
+                                     break;                                       
                              }
                              

Index: LinkLayerPanel.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/guiUI/LinkLayerPanel.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** LinkLayerPanel.java	14 Oct 2007 17:19:07 -0000	1.4
--- LinkLayerPanel.java	15 Oct 2007 12:04:33 -0000	1.5
***************
*** 158,161 ****
--- 158,164 ----
                  	LineTable.put(inName,new LinkLine(new Line2D.Double(inStart.x,inStart.y,inEnd.x,inEnd.y), new BasicStroke(3.0f), Color.BLUE));
                          break;                        
+                     case core.NetworkInterface.Serial:                        
+                 	LineTable.put(inName,new LinkLine(new Line2D.Double(inStart.x,inStart.y,inEnd.x,inEnd.y), new BasicStroke(3.0f), Color.RED));
+                         break; 
                  }
  

Index: SetTCPIPPropertiesDialog.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/guiUI/SetTCPIPPropertiesDialog.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** SetTCPIPPropertiesDialog.java	13 Oct 2007 12:57:00 -0000	1.8
--- SetTCPIPPropertiesDialog.java	15 Oct 2007 12:04:33 -0000	1.9
***************
*** 434,438 ****
  			
  			for (int i = 0; i < nics.length; i++) { //Add them to the combobox
!                             if(Sim.getNode(NodeName).getIntType((String)nics[i]) == core.NetworkInterface.Ethernet10T )
                                  cmbInterface.addItem(nics[i]);
  			}			
--- 434,438 ----
  			
  			for (int i = 0; i < nics.length; i++) { //Add them to the combobox
!                             if(Sim.getNode(NodeName).isActiveInterface((String)nics[i]) )
                                  cmbInterface.addItem(nics[i]);
  			}