Console: Merge UI changes for viewing content of internal netDbs

Author: eyedeekay

apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbHelper.java

@@ -30,6 +30,7 @@ public class NetDbHelper extends FormHandler {
     private long _date;
     private int _limit = DEFAULT_LIMIT;
     private boolean _lease;
+    private boolean _clientOnly;
     private boolean _debug;
     private boolean _graphical;
     private SigType _type;
@@ -70,7 +71,7 @@ public class NetDbHelper extends FormHandler {
                                            "",                                  // 9
                                            "?f=5",                              // 10
                                            "?f=6",                              // 11
-                                           "?l=3",                              // 12
+                                           "?l=7",                              // 12
                                           };
 
 
@@ -205,6 +206,7 @@ public void setFull(String f) {
     }
 
     public void setLease(String l) {
+        _clientOnly = "7".equals(l);
         _debug = "2".equals(l);
         _lease = _debug || "1".equals(l);
     }
@@ -246,6 +248,14 @@ public void setIntros(String f) {
             _icount = Integer.parseInt(f);
         } catch (NumberFormatException nfe) {}
     }
+
+    public void setClientPage(String f) {
+        try {
+
+        } catch(Exception e){
+            //if (_log.shouldLog)
+        }
+    }
 
     /**
      *  call for non-text-mode browsers
@@ -333,7 +343,7 @@ public String getNetDbSummary(String client, boolean clientOnly) {
                                               _family, _caps, _ip, _sybil, _port, _highPort, _type, _etype,
                                               _mtu, _ipv6, _ssucaps, _transport, _cost, _icount, client, clientOnly);
             } else if (_lease) {
-                renderer.renderLeaseSetHTML(_out, _debug, client, clientOnly);
+                renderer.renderLeaseSetHTML(_out, _debug, client, _clientOnly);
             } else if (_hostname != null) {
                 renderer.renderLeaseSet(_out, _hostname, true);
             } else if (_full == 3) {
@@ -344,6 +354,14 @@ else if ((_mode == 13 || _mode == 16) && !_postOK)
                 (new SybilRenderer(_context)).getNetDbSummary(_out, _newNonce, _mode, _date);
             } else if (_full == 4) {
                 renderLookupForm();
+            } else if (_full == 5) {
+                renderer.renderStatusHTML(_out, _limit, _page, _full, null, true);
+            } else if (_full == 6) {
+                renderer.renderStatusHTML(_out, _limit, _page, _full, null, true);
+            } else if (_clientOnly && client == null) {
+                for (String _client : _context.netDb().getClients()) {
+                    renderer.renderLeaseSetHTML(_out, _debug, _client, _clientOnly);
+                }
             } else {
                 if (_full == 0 && _sort != null)
                     _full = 3;
@@ -355,16 +373,6 @@ else if ((_mode == 13 || _mode == 16) && !_postOK)
         return "";
     }
 
-    public String getClientNetDbSummaries() {
-        String rv = "";
-        for (String client : _context.netDb().getClients()){
-            rv += "<div id=\"" + client + "\">\n";
-            rv += getClientNetDbSummary(client) + "\n";
-            rv += "</div>\n";
-        }
-        return rv;
-    }
-
     public String getClientNetDbSummary(String client) {
         return getNetDbSummary(client, true);
     }
@@ -394,6 +402,12 @@ private int getTab() {
             return 8;
         if (_hostname != null)
             return 9;
+        if (_full == 5)
+            return 10;
+        if (_full == 6)
+            return 11;
+        if (_clientOnly)
+            return 12;
         return 0;
     }
 
@@ -425,9 +439,9 @@ private void renderNavBar() throws IOException {
                     buf.append("<span class=\"tab\">");
                 buf.append("<a href=\"netdb").append(links[i]).append("\">").append(_t(titles[i])).append("</a>");
             }
-            if (span)
+            if (span) {
                 buf.append("</span>\n");
-            else if (i != titles.length - 1)
+            } else if (i != titles.length - 1)
                 buf.append("&nbsp;&nbsp;\n");
         }
         if (!span)

apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java

@@ -1062,14 +1062,19 @@ public void renderStatusHTML(Writer out, int pageSize, int page, int mode, Strin
      if (!showStats) {
 
         // the summary table
-        if (client != null) 
+        if (client != null) {
             buf.append("<table id=\"netdboverview\" border=\"0\" cellspacing=\"30\"><tr><th colspan=\"3\">")
                 .append(_t("Network Database Router Statistics for Client " + client))
                 .append("</th></tr><tr><td style=\"vertical-align: top;\">");
-        else
+        } else if (clientsOnly) {
+            buf.append("<table id=\"netdboverview\" border=\"0\" cellspacing=\"30\"><tr><th colspan=\"3\">")
+                .append(_t("Network Database Router Statistics for all Clients"))
+                .append("</th></tr><tr><td style=\"vertical-align: top;\">");
+        } else {
             buf.append("<table id=\"netdboverview\" border=\"0\" cellspacing=\"30\"><tr><th colspan=\"3\">")
                 .append(_t("Network Database Router Statistics for Floodfill Router"))
                 .append("</th></tr><tr><td style=\"vertical-align: top;\">");
+        }
         // versions table
         List<String> versionList = new ArrayList<String>(versions.objects());
         if (!versionList.isEmpty()) {