[Javanetsim-cvs] javaNetSim/guiUI GuiPrinter.java, NONE, 1.1 ApplicationLayerDevice.java, 1.10, 1.1
Status: Beta
Brought to you by:
darkkey
Menu
▾
▴
[Javanetsim-cvs] javaNetSim/guiUI GuiPrinter.java, NONE, 1.1 ApplicationLayerDevice.java, 1.10, 1.11 GuiPC.java, 1.4, 1.5 MainScreen.java, 1.77, 1.78 MenuBar.java, 1.17, 1.18 SandBox.java, 1.8, 1.9 SimulationToolBar.java, 1.3, 1.4
Update of /cvsroot/javanetsim/javaNetSim/guiUI In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv9138/guiUI Modified Files: ApplicationLayerDevice.java GuiPC.java MainScreen.java MenuBar.java SandBox.java SimulationToolBar.java Added Files: GuiPrinter.java Log Message: Added network printers. Index: MenuBar.java =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/guiUI/MenuBar.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** MenuBar.java 19 Oct 2007 08:52:27 -0000 1.17 --- MenuBar.java 20 Oct 2007 20:19:46 -0000 1.18 *************** *** 60,64 **** --- 60,66 ---- private JMenuItem mnuSwitch = new JMenuItem("Switch ..."); private JMenuItem mnuCSUDSU = new JMenuItem("CSU/DSU device..."); + private JMenuItem mnuPrinter = new JMenuItem("Printer..."); private JMenuItem mnuExternalNAT = new JMenuItem("Socks Proxy..."); + //help menu *************** *** 129,132 **** --- 131,135 ---- mnuAdd.add(mnuCSUDSU); mnuAdd.add(mnuExternalNAT); + mnuAdd.add(mnuPrinter); *************** *** 230,233 **** --- 233,245 ---- }); + + //Add action listener to new hub + mnuPrinter.addActionListener(new ActionListener(){ + public void actionPerformed(ActionEvent e){ + controller.setAllHighlightsOff(); + controller.addingNode(SandBox.PRINTER_CURSOR); + } + }); + mnuMsgLinkLayer.addActionListener(new ActionListener(){ public void actionPerformed(ActionEvent e){ Index: SimulationToolBar.java =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/guiUI/SimulationToolBar.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SimulationToolBar.java 15 Oct 2007 18:25:54 -0000 1.3 --- SimulationToolBar.java 20 Oct 2007 20:19:46 -0000 1.4 *************** *** 102,105 **** --- 102,107 ---- private JButton btnNewCSUDSU = new JButton(new ImageIcon(cl.getResource("images/simulation/csudsu_small.png"))); + + private JButton btnNewPrinter = new JButton(new ImageIcon(cl.getResource("images/simulation/printer_small.png"))); private JButton btnNewLink = new JButton(new ImageIcon(cl.getResource("images/simulation/link.gif"))); *************** *** 172,175 **** --- 174,179 ---- btnNewCSUDSU.setToolTipText("Creates a new CSU/DSU device"); + + btnNewPrinter.setToolTipText("Creates a new CSU/DSU device"); *************** *** 188,191 **** --- 192,197 ---- btnNewCSUDSU.setBorderPainted(false); + + btnNewPrinter.setBorderPainted(false); *************** *** 208,211 **** --- 214,231 ---- + btnNewPrinter.addActionListener(new ActionListener(){ + + public void actionPerformed(ActionEvent e){ + + setHighlightsOff(); //Clean out any buttons that may have been highlighted previously. + + highlightButton(btnNewPrinter, true); + + controller.addingNode(SandBox.PRINTER_CURSOR); + + } + + }); + //Set action listener for Hub toolbar item *************** *** 303,306 **** --- 323,328 ---- this.add(btnNewPC); + + this.add(btnNewPrinter); this.add(btnNewRouter); *************** *** 407,410 **** --- 429,434 ---- btnNewPC.setBackground(deactivatedColor); + + btnNewPrinter.setBackground(deactivatedColor); btnNewRouter.setBackground(deactivatedColor); Index: GuiPC.java =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/guiUI/GuiPC.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** GuiPC.java 15 Oct 2007 18:25:54 -0000 1.4 --- GuiPC.java 20 Oct 2007 20:19:46 -0000 1.5 *************** *** 55,59 **** --- 55,64 ---- package guiUI; + import java.awt.Dimension; + import java.awt.event.ActionEvent; + import java.awt.event.ActionListener; + import javax.swing.JMenuItem; + import javax.swing.JMenu; /** *************** *** 85,93 **** */ public GuiPC(String inName, MainScreen inMainScreen){ ! super(inName, inMainScreen, "images/simulation/mymac.png"); } --- 90,185 ---- */ + + private JMenuItem mnuEchoListen = new JMenuItem("Start udp echo server to listen."); + private JMenuItem mnuEchoSend = new JMenuItem("Send data via udp echo client."); + private JMenuItem mnuEchotcpListen = new JMenuItem("Start tcp echo server to listen."); + private JMenuItem mnuEchotcpSend = new JMenuItem("Send data via tcp echo client."); + private JMenuItem mnuTelnetListen = new JMenuItem("Start telnet server to listen."); + private JMenuItem mnuTelnetNoListen = new JMenuItem("Stop telnet server."); + private JMenuItem mnuTelnetConnect = new JMenuItem("Telnet client."); + private JMenuItem mnuPosixTelnet = new JMenuItem("RFC(line) telnet client."); + private JMenuItem mnuSNMPManager = new JMenuItem("Send SNMP message"); + private JMenuItem mnuDHCPD = new JMenuItem("Start DHCP Server"); public GuiPC(String inName, MainScreen inMainScreen){ ! super(inName, inMainScreen, "images/simulation/mymac.png"); + + mnuEchoListen.addActionListener(new ActionListener(){ + public void actionPerformed(ActionEvent e){ + controller.EchoServerListen(lblNodeName.getText()); + + + } + }); + mnuEchoSend.addActionListener(new ActionListener(){ + public void actionPerformed(ActionEvent e){ + controller.EchoSend(lblNodeName.getText()); + } + }); + + mnuEchotcpListen.addActionListener(new ActionListener(){ + public void actionPerformed(ActionEvent e){ + controller.EchotcpServerListen(lblNodeName.getText()); + + + } + }); + mnuEchotcpSend.addActionListener(new ActionListener(){ + public void actionPerformed(ActionEvent e){ + controller.EchotcpSend(lblNodeName.getText()); + } + }); + + mnuSNMPManager.addActionListener(new ActionListener(){ + public void actionPerformed(ActionEvent e){ + controller.SNMPSendMessage(lblNodeName.getText()); + } + }); + + mnuTelnetListen.addActionListener(new ActionListener(){ + public void actionPerformed(ActionEvent e){ + controller.TelnetListen(lblNodeName.getText()); + } + }); + mnuTelnetNoListen.addActionListener(new ActionListener(){ + public void actionPerformed(ActionEvent e){ + controller.TelnetNoListen(lblNodeName.getText()); + } + }); + mnuTelnetConnect.addActionListener(new ActionListener(){ + public void actionPerformed(ActionEvent e){ + controller.TelnetConnect(lblNodeName.getText()); + } + }); + + mnuPosixTelnet.addActionListener(new ActionListener(){ + public void actionPerformed(ActionEvent e){ + controller.PosixTelnet(lblNodeName.getText()); + } + }); + + mnuDHCPD.addActionListener(new ActionListener(){ + public void actionPerformed(ActionEvent e){ + controller.DHCPD(lblNodeName.getText()); + } + }); + + mnuAppLayer.addSeparator(); + mnuAppLayer.add(mnuEchoListen); + mnuAppLayer.add(mnuEchoSend); + mnuAppLayer.addSeparator(); + mnuAppLayer.add(mnuEchotcpListen); + mnuAppLayer.add(mnuEchotcpSend); + mnuAppLayer.addSeparator(); + mnuAppLayer.add(mnuSNMPManager); + mnuAppLayer.addSeparator(); + mnuAppLayer.add(mnuTelnetListen); + mnuAppLayer.add(mnuTelnetNoListen); + mnuAppLayer.add(mnuTelnetConnect); + mnuAppLayer.add(mnuPosixTelnet); + mnuAppLayer.addSeparator(); + mnuAppLayer.add(mnuDHCPD); } --- NEW FILE: GuiPrinter.java --- package guiUI; public class GuiPrinter extends ApplicationLayerDevice { public GuiPrinter(String inName, MainScreen inMainScreen){ super(inName, inMainScreen, "images/simulation/printer.png"); } } Index: SandBox.java =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/guiUI/SandBox.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** SandBox.java 15 Oct 2007 18:25:54 -0000 1.8 --- SandBox.java 20 Oct 2007 20:19:46 -0000 1.9 *************** *** 55,58 **** --- 55,59 ---- public static final int EXTERNALNAT_CURSOR = 4; public static final int CSUDSU_CURSOR = 5; + public static final int PRINTER_CURSOR = 6; private Cursor csrDefault = new Cursor(Cursor.DEFAULT_CURSOR); *************** *** 84,87 **** --- 85,91 ---- Image csudsuImage = Toolkit.getDefaultToolkit().getImage(cl.getResource("images/simulation/csudsu2.png")); Cursor customCSUDSUCursor = Toolkit.getDefaultToolkit().createCustomCursor(csudsuImage, cursorLocation, "csudsuCursor"); + + Image printerImage = Toolkit.getDefaultToolkit().getImage(cl.getResource("images/simulation/printer.png")); + Cursor customPrinterCursor = Toolkit.getDefaultToolkit().createCustomCursor(printerImage, cursorLocation, "printerCursor"); public SandBox(MainScreen inMainScreen){ *************** *** 216,219 **** --- 220,227 ---- Point NodeLocation = new Point(e.getX(), e.getY()); controller.addCSUDSU(NodeLocation); + }else if(this.getCursor() == customPrinterCursor){ + this.setCursor(csrDefault); + Point NodeLocation = new Point(e.getX(), e.getY()); + controller.addPrinter(NodeLocation); } } *************** *** 240,246 **** this.setCursor(customExternalNATCursor); }else if(cursorType == CSUDSU_CURSOR){ ! this.setCursor(customCSUDSUCursor); ! } ! } --- 248,255 ---- this.setCursor(customExternalNATCursor); }else if(cursorType == CSUDSU_CURSOR){ ! this.setCursor(customCSUDSUCursor); ! }else if(cursorType == PRINTER_CURSOR){ ! this.setCursor(customPrinterCursor); ! } } Index: MainScreen.java =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/guiUI/MainScreen.java,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** MainScreen.java 20 Oct 2007 13:27:21 -0000 1.77 --- MainScreen.java 20 Oct 2007 20:19:46 -0000 1.78 *************** *** 739,742 **** --- 739,801 ---- + public void addPrinter(Point inPoint){ + + String result = JOptionPane.showInputDialog(this,"Please enter a Printer name:","Create New Printer", JOptionPane.PLAIN_MESSAGE); + + if(result != null){ + + result = result.trim(); + + if (!result.equalsIgnoreCase("")){ + + try { + + Sim.addPrinter(result, true); + + Sim.getNode(result).addNetworkInterface(core.NetworkInterface.getIntName(core.NetworkInterface.Ethernet10T) + "0", core.NetworkInterface.Ethernet10T, true); + + GuiPrinter tempPC = new GuiPrinter(result,this); + + tempPC.setNodeLocation(inPoint); + + Sandbox.add(tempPC); + + Sandbox.setLayer(tempPC,3,0); + + GUInodeTable.put(result,tempPC); + + isDirty = true; + + this.setAllHighlightsOff(); + + //pnlConsole.append("Added PC "+result+" to simulation\n"); + + //mConsole.insertRow(mConsole.getRowCount(), new Object[]{"1","2,"3","4"}); + + } catch (InvalidNodeNameException e) { + + JOptionPane.showMessageDialog(this, "Invalid Printer name entered. Node with name: '" + result+"' all ready exist within Simulation","Invalid Pc name", JOptionPane.ERROR_MESSAGE); + + } + + + + }else{ + + JOptionPane.showMessageDialog(this, "Printer name not entered","Printer name not entered",JOptionPane.WARNING_MESSAGE); + + + + } + + + + } + + this.setAllHighlightsOff(); + + this.refreshNodeInformationTab(); + + } /** *************** *** 4351,4357 **** public void RunCmd(String inNodeName){ try{ ! Terminal r = new Terminal(this, (core.NetworkLayerDevice)Sim.getNode(inNodeName)); ! r.pack(); ! r.setVisible(true); } catch(InvalidNodeNameException e) { --- 4410,4420 ---- public void RunCmd(String inNodeName){ try{ ! if(!(Sim.getNode(inNodeName) instanceof core.NetworkLayerDevice) && !(Sim.getNode(inNodeName) instanceof core.Printer)){ ! Terminal r = new Terminal(this, (core.NetworkLayerDevice)Sim.getNode(inNodeName)); ! r.pack(); ! r.setVisible(true); ! }else{ ! JOptionPane.showMessageDialog(this, "Feature isn't supported by this device type!","Error", JOptionPane.ERROR_MESSAGE); ! } } catch(InvalidNodeNameException e) { Index: ApplicationLayerDevice.java =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/guiUI/ApplicationLayerDevice.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ApplicationLayerDevice.java 14 Oct 2007 17:19:07 -0000 1.10 --- ApplicationLayerDevice.java 20 Oct 2007 20:19:46 -0000 1.11 *************** *** 22,39 **** public class ApplicationLayerDevice extends NetworkLayerDevice { - private JMenuItem mnuEchoListen = new JMenuItem("Start udp echo server to listen."); - private JMenuItem mnuEchoSend = new JMenuItem("Send data via udp echo client."); - private JMenuItem mnuEchotcpListen = new JMenuItem("Start tcp echo server to listen."); - private JMenuItem mnuEchotcpSend = new JMenuItem("Send data via tcp echo client."); - private JMenuItem mnuTelnetListen = new JMenuItem("Start telnet server to listen."); - private JMenuItem mnuTelnetNoListen = new JMenuItem("Stop telnet server."); - private JMenuItem mnuTelnetConnect = new JMenuItem("Telnet client."); - private JMenuItem mnuPosixTelnet = new JMenuItem("RFC(line) telnet client."); protected JMenu mnuAppLayer = new JMenu("Applications"); private JMenuItem mnuSNMPStartAgent = new JMenuItem("Start SNMP agent"); private JMenuItem mnuSNMPStopAgent = new JMenuItem("Stop SNMP agent"); ! private JMenuItem mnuSNMPManager = new JMenuItem("Send SNMP message"); ! private JMenuItem mnuDHCPD = new JMenuItem("Start DHCP Server"); ! private JMenuItem mnuDHCPC = new JMenuItem("Run DHCP Client"); /** Creates a new instance of ApplicationLayerDevice */ --- 22,35 ---- public class ApplicationLayerDevice extends NetworkLayerDevice { protected JMenu mnuAppLayer = new JMenu("Applications"); + + private JMenuItem mnuDHCPC = new JMenuItem("Run DHCP Client"); + private JMenuItem mnuSNMPStartAgent = new JMenuItem("Start SNMP agent"); private JMenuItem mnuSNMPStopAgent = new JMenuItem("Stop SNMP agent"); ! ! ! ! /** Creates a new instance of ApplicationLayerDevice */ *************** *** 41,78 **** super(inName, inMainScreen, imageLocation); - - - mnuEchoListen.addActionListener(new ActionListener(){ - public void actionPerformed(ActionEvent e){ - controller.EchoServerListen(lblNodeName.getText()); - - - } - }); - mnuEchoSend.addActionListener(new ActionListener(){ - public void actionPerformed(ActionEvent e){ - controller.EchoSend(lblNodeName.getText()); - } - }); - - mnuEchotcpListen.addActionListener(new ActionListener(){ - public void actionPerformed(ActionEvent e){ - controller.EchotcpServerListen(lblNodeName.getText()); - - - } - }); - mnuEchotcpSend.addActionListener(new ActionListener(){ - public void actionPerformed(ActionEvent e){ - controller.EchotcpSend(lblNodeName.getText()); - } - }); - GuiNodePopMenu.add(mnuAppLayer); ! mnuAppLayer.add(mnuEchoListen); ! mnuAppLayer.add(mnuEchoSend); ! mnuAppLayer.addSeparator(); ! mnuAppLayer.add(mnuEchotcpListen); ! mnuAppLayer.add(mnuEchotcpSend); mnuSNMPStartAgent.addActionListener(new ActionListener(){ --- 37,43 ---- super(inName, inMainScreen, imageLocation); GuiNodePopMenu.add(mnuAppLayer); ! ! mnuSNMPStartAgent.addActionListener(new ActionListener(){ *************** *** 86,122 **** } }); ! mnuSNMPManager.addActionListener(new ActionListener(){ ! public void actionPerformed(ActionEvent e){ ! controller.SNMPSendMessage(lblNodeName.getText()); ! } ! }); ! ! mnuTelnetListen.addActionListener(new ActionListener(){ ! public void actionPerformed(ActionEvent e){ ! controller.TelnetListen(lblNodeName.getText()); ! } ! }); ! mnuTelnetNoListen.addActionListener(new ActionListener(){ ! public void actionPerformed(ActionEvent e){ ! controller.TelnetNoListen(lblNodeName.getText()); ! } ! }); ! mnuTelnetConnect.addActionListener(new ActionListener(){ ! public void actionPerformed(ActionEvent e){ ! controller.TelnetConnect(lblNodeName.getText()); ! } ! }); ! ! mnuPosixTelnet.addActionListener(new ActionListener(){ ! public void actionPerformed(ActionEvent e){ ! controller.PosixTelnet(lblNodeName.getText()); ! } ! }); ! ! mnuDHCPD.addActionListener(new ActionListener(){ ! public void actionPerformed(ActionEvent e){ ! controller.DHCPD(lblNodeName.getText()); ! } ! }); mnuDHCPC.addActionListener(new ActionListener(){ --- 51,55 ---- } }); ! mnuDHCPC.addActionListener(new ActionListener(){ *************** *** 126,142 **** }); - mnuAppLayer.addSeparator(); mnuAppLayer.add(mnuSNMPStartAgent); mnuAppLayer.add(mnuSNMPStopAgent); ! mnuAppLayer.add(mnuSNMPManager); ! mnuAppLayer.addSeparator(); ! mnuAppLayer.add(mnuTelnetListen); ! mnuAppLayer.add(mnuTelnetNoListen); ! mnuAppLayer.add(mnuTelnetConnect); ! mnuAppLayer.addSeparator(); ! mnuAppLayer.add(mnuPosixTelnet); ! mnuAppLayer.addSeparator(); ! mnuAppLayer.add(mnuDHCPC); ! mnuAppLayer.add(mnuDHCPD); } } --- 59,66 ---- }); mnuAppLayer.add(mnuSNMPStartAgent); mnuAppLayer.add(mnuSNMPStopAgent); ! mnuAppLayer.addSeparator(); ! mnuAppLayer.add(mnuDHCPC); } } |
