[Thaw-dev] r12102 - in trunk/apps/Thaw/src/thaw: fcp plugins/peerMonitor

[jfle...@freenetproject.org]

Author: jflesch
Date: 2007-03-12 14:32:33 +0000 (Mon, 12 Mar 2007)
New Revision: 12102

Added:
   trunk/apps/Thaw/src/thaw/fcp/FCPListPeers.java
Modified:
   trunk/apps/Thaw/src/thaw/fcp/FCPMessage.java
   trunk/apps/Thaw/src/thaw/fcp/FCPQuery.java
   trunk/apps/Thaw/src/thaw/plugins/peerMonitor/PeerMonitorPanel.java
Log:
Fix PeerMonitor plugin + MDNSDiscovery plugin

Added: trunk/apps/Thaw/src/thaw/fcp/FCPListPeers.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPListPeers.java                              
(rev 0)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPListPeers.java      2007-03-12 14:32:33 UTC 
(rev 12102)
@@ -0,0 +1,58 @@
+package thaw.fcp;
+
+import java.util.Observer;
+import java.util.Observable;
+
+
+public class FCPListPeers extends Observable implements FCPQuery, Observer {
+
+       private boolean withMetadata;
+       private boolean withVolatile;
+
+       private FCPQueueManager queueManager;
+
+
+       public FCPListPeers(boolean withMetadata, boolean withVolatile) {
+               this.withMetadata = withMetadata;
+               this.withVolatile = withVolatile;
+       }
+
+
+       public boolean start(FCPQueueManager queueManager) {
+               FCPMessage msg = new FCPMessage();
+
+               msg.setMessageName("ListPeers");
+               msg.setValue("WithMetadata", Boolean.toString(withMetadata));
+               msg.setValue("WithVolatile", Boolean.toString(withVolatile));
+
+               queueManager.getQueryManager().addObserver(this);
+
+               return queueManager.getQueryManager().writeMessage(msg);
+       }
+
+
+       public boolean stop(FCPQueueManager queueManager) {
+               queueManager.getQueryManager().deleteObserver(this);
+               return true;
+       }
+
+       public void update(Observable o, Object param) {
+               if (o instanceof FCPQueryManager) {
+                       final FCPMessage msg = (FCPMessage)param;
+
+                       if (msg.getMessageName() == null
+                           || !msg.getMessageName().equals(""))
+                               return;
+
+                       /* TODO */
+
+                       setChanged();
+                       notifyObservers(this);
+               }
+       }
+
+
+       public int getQueryType() {
+               return 0;
+       }
+}

Modified: trunk/apps/Thaw/src/thaw/fcp/FCPMessage.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPMessage.java        2007-03-11 16:25:10 UTC 
(rev 12101)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPMessage.java        2007-03-12 14:32:33 UTC 
(rev 12102)
@@ -75,11 +75,11 @@
        }

        public void setMessageName(final String name) {
-               if((name == null) || "".equals( name )) {
+               if ((name == null) || "".equals( name )) {
                        Logger.notice(this, "Setting name to empty ? weird");
                }

-               if(name.indexOf("\n")>=0) {
+               if (name.indexOf("\n") >= 0) {
                        Logger.notice(this, "Name shouldn't contain '\n'");
                }


Modified: trunk/apps/Thaw/src/thaw/fcp/FCPQuery.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPQuery.java  2007-03-11 16:25:10 UTC (rev 
12101)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPQuery.java  2007-03-12 14:32:33 UTC (rev 
12102)
@@ -19,7 +19,7 @@

        /**
         * Tell if the query is a download query or an upload query.
-        * If >= 1 then *must* be Observable and implements FCPTransfertQuery.
+        * If >= 1 then *must* be Observable and implements FCPTransferQuery.
         * @return 0 : Meaningless ; 1 : Download ; 2 : Upload ; >= 2 : ?
         */
        public int getQueryType();

Modified: trunk/apps/Thaw/src/thaw/plugins/peerMonitor/PeerMonitorPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/peerMonitor/PeerMonitorPanel.java  
2007-03-11 16:25:10 UTC (rev 12101)
+++ trunk/apps/Thaw/src/thaw/plugins/peerMonitor/PeerMonitorPanel.java  
2007-03-12 14:32:33 UTC (rev 12102)
@@ -13,6 +13,9 @@
 import java.awt.BorderLayout;
 import java.awt.GridLayout;

+import java.util.Vector;
+import java.util.HashMap;
+
 import thaw.core.Config;
 import thaw.core.I18n;

@@ -62,7 +65,7 @@
                memBar.setStringPainted(true);

                panel.add(mainPanel, BorderLayout.CENTER);
-               panel.add(peerList, BorderLayout.EAST);
+               panel.add(new JScrollPane(peerList), BorderLayout.EAST);
                panel.add(memBar, BorderLayout.SOUTH);
        }

@@ -86,6 +89,17 @@
        }


+       /**
+        * @param peerNames see java.lang.String
+        * @param peerInfos see java.lang.HashMap
+        */
+       public synchronized void setPeerList(Vector peerNames, Vector peerInfos)
+       {
+
+       }
+
+
+
        public JPanel getPanel() {
                return panel;
        }
@@ -95,6 +109,5 @@
                if (e.getSource() == refCopyButton) {
                        thaw.gui.GUIHelper.copyToClipboard(refArea.getText());
                }
-
        }
 }