[Javanetsim-cvs] javaNetSim/guiUI MainScreen.java,1.57,1.58

[gift <gi...@us...>]

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

Modified Files:
	MainScreen.java 
Log Message:
color bug fixed. HTML generation optimized.

Index: MainScreen.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/guiUI/MainScreen.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** MainScreen.java	15 Sep 2007 11:56:38 -0000	1.57
--- MainScreen.java	15 Sep 2007 12:36:21 -0000	1.58
***************
*** 2836,2840 ****
--- 2836,2843 ----
         	/**
  	 * Generates HTML code from text in console.
+          * Is not used. generate_html_console_out_rapid is used instead.
  	 *
+          * P.S. Generation is independent of mConsole structure => slower that generate_html_console_out_rapid. Has some bugs with coloring
+          * that are not fixed due to my lazy mood.
  	 */ 
          public StringBuffer generate_html_console_out(){
***************
*** 2843,2847 ****
              int clr = 0xFFFFFF;
              int mask = 0xFFFFFF;
!             StringBuffer out = new StringBuffer(655360);
              String cur;
              boolean color_selected = false;                       
--- 2846,2859 ----
              int clr = 0xFFFFFF;
              int mask = 0xFFFFFF;
!             /*
!              When I have done generate_html_console_out_rapid I decided to comment out StringBuffer(655360). There is a chance that java will allocate memory ;)
!              If you plan to use generate_html_console_out instead of generate_html_console_out_rapid you'd better use StringBuffer(655360).
!              */
!             
!             // UNCOMMENT NEXT LINE
!                     //StringBuffer out = new StringBuffer(655360);
!             // COMMENT NEXT LINE
!             StringBuffer out = new StringBuffer(1024);
!             
              String cur;
              boolean color_selected = false;                       
***************
*** 2904,2909 ****
          }
  
  	
- 
  	class GraphicFilter extends FileFilter{
  
--- 2916,2978 ----
          }
  
+         /**
+ 	 * Generates HTML code from text in console.
+ 	 *
+          * P.S. Depends on mConsole structure => faster that generate_html_console_out and has less bugs with coloring :)
+ 	 */ 
+         public StringBuffer generate_html_console_out_rapid(){
+             
+             int i,j;
+             int clr = 0xFFFFFF;            
+             int r_c = mConsole.getRowCount();
+             StringBuffer out = new StringBuffer(655360);
+             String cur;
+            
+             if (mConsole.getColumnCount()>0 && r_c>0)
+             {    
+                         out.append("<TABLE align=\"center\" cellSpacing=\"0\" cellPadding=\"0\" width=\"100%\" border=\"0\" style='border:solid windowtext 1.0pt;'>\r\n<TR bgColor=#FFFFFF>");
+                         //Form table header   
+                         for (i=0; i<mConsole.getColumnCount(); i++)
+                         {
+                           out.append("<TD>" + mConsole.getColumnName(i) + "</TD>");
+                         }
+                         out.append("</TR>\r\n<!-- main console output body -->\r\n\r\n");
+                                    
+                         //Form table body                        
+                         for (j=0; j<r_c; j++)
+                         {   
+                             //Select color for TR background 
+                             cur = (String) mConsole.getValueAt(j,3);
+                             if(cur.contains("Network")){
+                                 clr = NETWORK_LAYER_COLOR.getRGB();                                    
+                             }else if(cur.contains("Link")){
+                                 clr = LINK_LAYER_COLOR.getRGB();                                    
+                             }else if(cur.contains("Transport")){
+                                clr = TRANSPORT_LAYER_COLOR.getRGB();                                   
+                             }else if(cur.contains("Application")){
+                                 clr = APPLICATION_LAYER_COLOR.getRGB();                                    
+                             }else if(cur.contains("Hardware")){
+                                 clr = HARDWARE_LAYER_COLOR.getRGB();                                    
+                             }else if(cur.contains("*SYSTEM*")){
+                                 clr = SYSTEM_LAYER_COLOR.getRGB();                                    
+                             }
+                                 
+                           //add table row 
+                           out.append("<TR bgColor=#" + String.format("%06X", clr & 0xFFFFFF) + ">\r\n");      
+                           for (i=0; i<5; i++)
+                           {               
+                            out.append("<TD vAlign=\"top\">" + (String) mConsole.getValueAt(j,i) + "</TD>");                                                                                                                                                    
+                           }                          
+                           out.append("\r\n</TR>\r\n");
+                         }                        
+                         out.append("</TABLE>\r\n<!-- main console output body end -->\r\n\r\n");            
+             } else
+             {
+              out.append("<BR />Nothing to show in simulation transactions.<BR />");                   
+             }
+             
+             return out;
+         }
  	
  	class GraphicFilter extends FileFilter{
  
***************
*** 3178,3182 ****
          public void generate_html_report()
          {            
!          this.addToConsole(generate_html_console_out().toString());
          }
  
--- 3247,3251 ----
          public void generate_html_report()
          {            
!          this.addToConsole(generate_html_console_out_rapid().toString());
          }