Changeset 23

Timestamp:

10/21/05 00:52:48 (5 years ago)

Author:

dsandler

Message:

Minimal Swing GUI wrapped around the proxy.

$ java -cp ftproxy.jar net.feedtree.proxyapp.gui.AppGUI -N -V

Might make this the default class for ftproxy.jar, and create a "ftproxy"
shell script which invokes proxyapp.WebProxyClient? instead.

Lots of stuff to fix, including making the hyperlink functional with
JEditorPane.

This feature tracked by ticket #21.

Files:

• feedtree/trunk/src/net/feedtree/core/client/Client.java (modified) (4 diffs)
• feedtree/trunk/src/net/feedtree/proxyapp/WebProxyClient.java (modified) (8 diffs)
• feedtree/trunk/src/net/feedtree/proxyapp/gui (added)
• feedtree/trunk/src/net/feedtree/proxyapp/gui/AppGUI.java (added)
• feedtree/trunk/src/net/feedtree/util/TimeUtils.java (added)

feedtree/trunk/src/net/feedtree/core/client/Client.java

@@ -29 +29 @@
-    public static int           PASTRY_PROTOCOL = DistPastryNodeFactory.PROTOCOL_SOCKET;
-    
+    protected static InetSocketAddress g_localNodeAddress = null;
+
+    public static InetSocketAddress getLocalNodeAddress() { 
+        return g_localNodeAddress; 
+    }
+
-    // ------------------------------------------------------------
-    // members
@@ -36 +42 @@
-    protected Responder     m_responder = null;
-    protected Map           m_topics = Collections.synchronizedMap(new HashMap());
-
-
-    public String       getInstance() { return PASTRY_APP_NAME; }
@@ -249 +254 @@
-                    InetAddress natAddr = NAT.findNatAddress(
-                            port, bootSocketList, pastryEnv);
-InetSocketAddress 
+g_
-                    if (natAddr != null)
-
+g_
-                
-                    Logger.global.fine("[Contacting bootstrap host "
@@ -258 +263 @@
-                    node = factory.newNode(
-                        factory.getNodeHandle(bootSocketList[0]),
-
+g_
-                } catch (java.io.StreamCorruptedException exc) {
-                    Logger.global.severe("Stream corruption error while finding bootstrap.  Sleeping and trying again.");

feedtree/trunk/src/net/feedtree/proxyapp/WebProxyClient.java

@@ -63 +63 @@
-    static String FEEDTREE_SCRIBE_FEED_MIME = "application/atom+xml";
-
+    public static boolean HEADLESS = true;
-    
-    static final String VERSION_STRING = "0.2";
-    static final String USER_AGENT = "feedtree.Proxy/" + VERSION_STRING;
-
-
+public 
-
-    static Properties g_buildProperties;
@@ -77 +78 @@
-
-    protected int m_proxyPort;
+    protected int m_webPort;
-    protected int m_overloadFactor;
-    protected boolean m_appendEntryInfo = true;
@@ -463 +465 @@
-        }
-
-        protected String duration(long millis) {
-            long time = millis / 1000;
-            StringBuffer s = new StringBuffer();
-            if (time > 86400) {
-                long days = time / 86400;
-                if (days > 0) {
-                    time = time - 86400 * days;
-                    s.append(days);
-                    s.append("d");
-                }
-            }
-            long hours = 0;
-            long minutes = 0;
-            if (time > 3600) {
-                hours = time / 3600;
-                time = time - 3600 * hours;
-            }
-            if (time > 60) {
-                minutes = time / 60;
-                time = time - 60 * minutes;
-            }
-            if (hours > 0) {
-                s.append(hours);
-                s.append("h");
-            }
-            if (minutes > 0) {
-                if (minutes < 10) s.append("0");
-                s.append(minutes);
-                s.append("m");
-            }
-            if (time > 0 || millis < 1000 || s.equals("")) {
-                if (time < 10 && millis > 10000) s.append("0");
-                s.append(time);
-                s.append("s");
-            }
-            return s.toString();
-        }
-        
-        protected void printStatusPage(PrintWriter output, WebInterfaceHandler handler) {
@@ -512 +477 @@
-            String proxyInterface = host + ":" + m_proxyPort;
-            String nodeInfo = "Node: " + m_node.toString() + "\nId: " + m_node.getId().toStringFull();
-
+TimeUtils.
-            output.write("<div id=\"serverinfo\"><table>"
-                + "<tr><th align=right>Web interface:</th><td>" + webInterface + "</td></tr>"
@@ -629 +594 @@
-                    + feed.getUri() 
-                        + "\" alt=\"[event log for feed]\" /></a>&nbsp;" 
-
+TimeUtils.
-                    + "</td>"
-
@@ -903 +868 @@
-        }
-    }
+    
+    public long getUptime() {
+        return new Date().getTime() - m_startDate.getTime();
+    }
+    public String getUptimeString() {
+        return TimeUtils.duration(getUptime());
+    }
+    
+    public String getWebInterfaceURL() {
+        //Socket sock = handler.getSocket();
+        //String host = sock.getLocalAddress().toString().substring(1);
+        //return "http://" + host + ":" + sock.getLocalPort();
+        return "http://localhost:" + m_webPort;
+    }
+    
+    public int getProxyPort() { return m_proxyPort; }
-
-    protected class ReportSource implements Reporter.IReportSource {
@@ -946 +927 @@
-        
-        m_proxyPort = proxyPort;
+        m_webPort = webPort;
-        m_startDate = new Date();
-        
@@ -1212 +1194 @@
-      
-        // Disable use of graphics accelerator for Sparklines
-
+
+
-        
-        // Circumvent broken aspects of the Apple JVM