[zipdiff-cvs] zipdiff/src/main/zipdiff/output HtmlBuilder.java,1.2,1.3

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/zipdiff/zipdiff/src/main/zipdiff/output
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25872/src/main/zipdiff/output

Modified Files:
	HtmlBuilder.java 
Log Message:
improved HTML style and format


Index: HtmlBuilder.java
===================================================================
RCS file: /cvsroot/zipdiff/zipdiff/src/main/zipdiff/output/HtmlBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** HtmlBuilder.java	9 Jun 2004 15:29:14 -0000	1.2
--- HtmlBuilder.java	27 Jun 2004 19:45:27 -0000	1.3
***************
*** 25,34 ****
  
          pw.println("<html>");
          pw.println("<head>");
          pw.println("<title>File differences</title>");
          pw.println("</head>");
  
!         pw.println("<body>");
! 
          pw.print("File 1: ");
          String filename1 = d.getFilename1();
--- 25,36 ----
  
          pw.println("<html>");
+         pw.println("<META http-equiv=\"Content-Type\" content=\"text/html\">");
          pw.println("<head>");
          pw.println("<title>File differences</title>");
          pw.println("</head>");
  
!         pw.println("<body text=\"#000000\" vlink=\"#000000\" alink=\"#000000\" link=\"#000000\">");
!         
!         pw.println(getStyleTag());
          pw.print("File 1: ");
          String filename1 = d.getFilename1();
***************
*** 64,107 ****
  
      protected void writeAdded(PrintWriter pw, Set added) {
!         pw.println("<h3>Added</h3>");
!         if (added.size() > 0) {
!             pw.println("<ul>");
!             Iterator iter = added.iterator();
!             while (iter.hasNext()) {
!                 String key = (String) iter.next();
!                 pw.print("<li>");
!                 pw.print(key);
!                 pw.println("</li>");
!             }
!             pw.println("</ul>");
!         } else {
!             pw.println("None");
!         }
! 
      }
  
      protected void writeRemoved(PrintWriter pw, Set removed) {
!         pw.println("<h3>Removed</h3>");
!         if (removed.size() > 0) {
!             pw.println("<ul>");
!             Iterator iter = removed.iterator();
!             while (iter.hasNext()) {
!                 String key = (String) iter.next();
!                 pw.print("<li>");
!                 pw.print(key);
!                 pw.println("</li>");
!             }
!             pw.println("</ul>");
!         } else {
!             pw.println("None");
!         }
! 
      }
  
      protected void writeChanged(PrintWriter pw, Set changed) {
!         pw.println("<h3>Changed</h3>");
!         if (changed.size() > 0) {
              pw.println("<ul>");
!             Iterator iter = changed.iterator();
              while (iter.hasNext()) {
                  String key = (String) iter.next();
--- 66,92 ----
  
      protected void writeAdded(PrintWriter pw, Set added) {
!     	writeDiffSet(pw, "Added", added);
      }
  
      protected void writeRemoved(PrintWriter pw, Set removed) {
!     	writeDiffSet(pw, "Removed", removed);
      }
  
      protected void writeChanged(PrintWriter pw, Set changed) {
!     	writeDiffSet(pw, "Changed", changed);
!     }
! 
!     protected void writeDiffSet(PrintWriter pw, String name, Set s) {
!     	pw.println("<TABLE CELLSPACING=\"1\" CELLPADDING=\"3\" WIDTH=\"100%\" BORDER=\"0\">");
!     	pw.println("<tr>");
!         pw.println("<td class=\"diffs\" colspan=\"2\">" + name  + "(" + s.size() + " entries)</td>");
!         pw.println("</tr>");
!         pw.println("<tr>");
!         pw.println("<td width=\"20\">");
!         pw.println("</td>");
!         pw.println("<td>");
!         if (s.size() > 0) {
              pw.println("<ul>");
!             Iterator iter = s.iterator();
              while (iter.hasNext()) {
                  String key = (String) iter.next();
***************
*** 111,117 ****
              }
              pw.println("</ul>");
-         } else {
-             pw.println("None");
          }
      }
  
--- 96,131 ----
              }
              pw.println("</ul>");
          }
+         pw.println("</td>");
+         pw.println("</tr>");
+         pw.println("</table>");
+ 
+     }
+ 
+     protected String getStyleTag()
+     {
+         StringBuffer sb = new StringBuffer();
+         
+         sb.append("<style type=\"text/css\">");
+         sb.append(" body, p { ");
+         sb.append(" font-family: verdana,arial,helvetica; ");
+         sb.append(" font-size: 80%; ");
+         sb.append(" color:#000000; ");
+         sb.append(" } \n");
+         sb.append(" 	  .diffs { \n");
+         sb.append("         font-family: verdana,arial,helvetica; \n");
+         sb.append("         font-size: 80%; \n");
+         sb.append(" font-weight: bold; \n");
+         sb.append(" text-align:left; \n");
+         sb.append(" background:#a6caf0; \n");
+ 	  	sb.append(" } \n"); 
+         sb.append(" tr, td { \n");
+         sb.append(" font-family: verdana,arial,helvetica; \n");
+         sb.append(" font-size: 80%; \n");
+         sb.append(" background:#eeeee0; \n");
+         sb.append(" } \n");  
+         sb.append(" </style>\n");
+         
+         return sb.toString();
      }