[Javanetsim-cvs] javaNetSim/guiUI MainScreen.java,1.38,1.39 MenuBar.java,1.3,1.4

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

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

Modified Files:
	MainScreen.java MenuBar.java 
Log Message:


Index: MainScreen.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/guiUI/MainScreen.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** MainScreen.java	27 Feb 2006 16:54:49 -0000	1.38
--- MainScreen.java	2 Mar 2006 13:37:04 -0000	1.39
***************
*** 182,185 ****
--- 182,186 ----
  	//filters
          private boolean[] filters = new boolean[8];
+         private boolean[] filters2 = new boolean[2];
  
  	//Toolbar
***************
*** 262,265 ****
--- 263,269 ----
                      filters[i] =true;
  
+                 filters2[0] = true;
+                 filters2[1] = true;
+                 
  		buildGUI();	
  
***************
*** 417,420 ****
--- 421,445 ----
          }
  
+         /*
+          * This method set value of filter.
+          * @author Key
+          * @param filter index
+          * @param filter value
+          *
+          */
+         public void setFilter2(int i, boolean value){
+             filters2[i] = value;
+         }
+ 	
+          /*
+          * This method get value of filter.
+          * @author Key
+          * @param filter index
+          * @returns filter value
+          *
+          */
+         public boolean getFilter2(int i){
+             return filters2[i];
+         }
  	/**
  
***************
*** 1076,1084 ****
  
  					String recording[] = (String[])it.next();
! 
                                          //Very UGLY but works. ;)
                                          if(!(((String)recording[4]).contains("Network") && !filters[2]) && !(((String)recording[4]).contains("Link") && !filters[0]) && !(((String)recording[4]).contains("Transport") && !filters[3]) && !(((String)recording[4]).contains("Application") && !filters[4])){
                                                              // && !(((String)recording[4]).contains("ARP") && !filters[1])
!                                                             pnlConsole.append(pad(recording[1],15,' ')+pad(recording[2],25,' ')+pad(recording[3],15,' ')+pad(recording[4],10,' ')+recording[5]+ "\n");                                           
                                          }
  
--- 1101,1115 ----
  
  					String recording[] = (String[])it.next();
!                                         String packet="";
!                                         String layer="";
                                          //Very UGLY but works. ;)
                                          if(!(((String)recording[4]).contains("Network") && !filters[2]) && !(((String)recording[4]).contains("Link") && !filters[0]) && !(((String)recording[4]).contains("Transport") && !filters[3]) && !(((String)recording[4]).contains("Application") && !filters[4])){
                                                              // && !(((String)recording[4]).contains("ARP") && !filters[1])
!                                                             
!                                                         if(filters2[0]) packet = pad(recording[2],25,' ');
!                                                         else packet="";
!                                                         if(filters2[1]) layer = pad(recording[4],15,' ');
!                                                         else layer="";
!                                                         pnlConsole.append(pad(recording[1],15,' ')+packet+pad(recording[3],10,' ')+layer+recording[5]+ "\n");                                           
                                          }
  

Index: MenuBar.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/guiUI/MenuBar.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MenuBar.java	23 Feb 2006 14:37:09 -0000	1.3
--- MenuBar.java	2 Mar 2006 13:37:04 -0000	1.4
***************
*** 34,39 ****
  	private JMenuItem mnuClearNodeInformation = new JMenuItem("Clear Node Information");
          private JMenu mnuFilters = new JMenu("Show simulation messages for:");
!         
          //Filters menu
          private JCheckBoxMenuItem mnuMsgLinkLayer = new JCheckBoxMenuItem("Link and DataLink Layers",true);
          private JCheckBoxMenuItem mnuMsgARP = new JCheckBoxMenuItem("ARP",true);
--- 34,43 ----
  	private JMenuItem mnuClearNodeInformation = new JMenuItem("Clear Node Information");
          private JMenu mnuFilters = new JMenu("Show simulation messages for:");
!         private JMenu mnuFilters2 = new JMenu("Show headers:");
          //Filters menu
+         
+         private JCheckBoxMenuItem mnuLayers = new JCheckBoxMenuItem("for Layers",true);
+         private JCheckBoxMenuItem mnuPackets = new JCheckBoxMenuItem("for Packet Names",true);
+         
          private JCheckBoxMenuItem mnuMsgLinkLayer = new JCheckBoxMenuItem("Link and DataLink Layers",true);
          private JCheckBoxMenuItem mnuMsgARP = new JCheckBoxMenuItem("ARP",true);
***************
*** 109,112 ****
--- 113,120 ----
  		mnuEnvironment.add(mnuClearNodeInformation);
                  mnuEnvironment.add(mnuFilters);
+                 mnuEnvironment.add(mnuFilters2);
+                 
+                 mnuFilters2.add(mnuLayers);
+                 mnuFilters2.add(mnuPackets);
                  
                  mnuFilters.add(mnuMsgLinkLayer);
***************
*** 186,189 ****
--- 194,209 ----
  		});
                  
+                 mnuLayers.addActionListener(new ActionListener(){
+ 			public void actionPerformed(ActionEvent e){
+ 				controller.setFilter2(1,!controller.getFilter2(1));
+ 			}
+ 		});
+                 
+                 mnuPackets.addActionListener(new ActionListener(){
+ 			public void actionPerformed(ActionEvent e){
+ 				controller.setFilter2(0,!controller.getFilter2(0));
+ 			}
+ 		});
+                 
                  mnuMsgARP.addActionListener(new ActionListener(){
  			public void actionPerformed(ActionEvent e){