From 118d7fce091c68f74fbdc394b6762eec3f7e5ac1 Mon Sep 17 00:00:00 2001
From: z3d <z3d@mail.i2p>
Date: Tue, 21 Jul 2009 16:37:44 +0000
Subject: [PATCH] Remove redundant table generation code for header links in
 i2psnark. (Thanks zzz!) Also, add snark.css to the file manifest.

---
 .../java/src/org/klomp/snark/web/I2PSnarkServlet.java        | 5 -----
 build.xml                                                    | 4 +++-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
index 40f5e61cc..9b5513d49 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@@ -86,7 +86,6 @@ public class I2PSnarkServlet extends HttpServlet {
 out.write("<div class=\"page\"><table border=\"0\" width=\"100%\"><tr><td align=\"center\" valign=\"top\" class=\"snarkTitle\">I2PSnark<br>Anonymous BitTorrent Client for I2P<hr /></hr></td></tr>");
         out.write("<tr><td align=\"center\"><a href=\"" + req.getRequestURI() + peerString + "\" class=\"snarkRefresh\">Refresh</a>");
         out.write(" | <a href=\"http://forum.i2p/viewforum.php?f=21\" class=\"snarkRefresh\">Forum</a>\n");
-        int count = 0;
         Map trackers = _manager.getTrackers();
         for (Iterator iter = trackers.entrySet().iterator(); iter.hasNext(); ) {
             Map.Entry entry = (Map.Entry)iter.next();
@@ -96,12 +95,8 @@ out.write("<div class=\"page\"><table border=\"0\" width=\"100%\"><tr><td align=
             if (e < 0)
                 continue;
             baseURL = baseURL.substring(e + 1);
-            if (count++ % 2 == 0)
-                out.write("");
             out.write(" | <a href=\"" + baseURL + "\" class=\"snarkRefresh\">" + name + "</a>");
         }
-        if (count % 2 == 1)
-            out.write("");
         out.write("</table>\n");
         out.write("<div class=\"snarkMessages\"><table><tr><td valign=\"top\" align=\"left\"><pre>");
         List msgs = _manager.getMessages();
diff --git a/build.xml b/build.xml
index f3832ced9..a4a78f2b7 100644
--- a/build.xml
+++ b/build.xml
@@ -322,6 +322,8 @@
     <target name="prepthemeupdates">
         <!-- CSS now in docs/, not in the .war; just in case anybody is using defCon1 -->
         <copy file="installer/resources/themes/console/defCon1/console.css" todir="pkg-temp/docs/themes/console/defCon1/" />
+        <!-- Add extricated I2PSnark css here, for now -->
+        <copy file="installer/resources/themes/console/snark.css" todir="pkg-temp/docs/themes/console/" />
         <!-- these files now in docs/, not in the .war -->
         <copy file="installer/resources/themes/console/images/favicon.ico" todir="pkg-temp/docs/themes/console/images/" />
         <copy file="installer/resources/themes/console/images/i2plogo.png" todir="pkg-temp/docs/themes/console/images/" />
@@ -340,7 +342,7 @@
         <!-- Add light theme -->
         <copy todir="pkg-temp/docs/themes/console/light/" >
             <fileset  dir="installer/resources/themes/console/light/" />
-        </copy>
+        </copy> 
         <copy todir="pkg-temp/docs/" >
           <fileset dir="." includes="readme*.html" />
         </copy>