Author: jflesch
Date: 2007-03-09 20:13:38 +0000 (Fri, 09 Mar 2007)
New Revision: 12071
Added:
trunk/apps/Thaw/images/min-peerMonitor.png
trunk/apps/Thaw/images/peerMonitor.png
trunk/apps/Thaw/src/thaw/plugins/peerMonitor/
trunk/apps/Thaw/src/thaw/plugins/peerMonitor/PeerMonitorPanel.java
Modified:
trunk/apps/Thaw/images/queueWatcher.png
trunk/apps/Thaw/src/thaw/core/IconBox.java
trunk/apps/Thaw/src/thaw/core/Logger.java
trunk/apps/Thaw/src/thaw/core/PluginManager.java
trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java
trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java
trunk/apps/Thaw/src/thaw/fcp/FCPConnection.java
trunk/apps/Thaw/src/thaw/gui/MDNSDiscoveryPanel.java
trunk/apps/Thaw/src/thaw/i18n/thaw.properties
trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties
Log:
Fix Thaw build
Added: trunk/apps/Thaw/images/min-peerMonitor.png
===================================================================
(Binary files differ)
Property changes on: trunk/apps/Thaw/images/min-peerMonitor.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/apps/Thaw/images/peerMonitor.png
===================================================================
(Binary files differ)
Property changes on: trunk/apps/Thaw/images/peerMonitor.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/apps/Thaw/images/queueWatcher.png
===================================================================
(Binary files differ)
Modified: trunk/apps/Thaw/src/thaw/core/IconBox.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/IconBox.java 2007-03-09 19:57:01 UTC (rev
12070)
+++ trunk/apps/Thaw/src/thaw/core/IconBox.java 2007-03-09 20:13:38 UTC (rev
12071)
@@ -73,6 +73,10 @@
public static ImageIcon queueWatcher;
public static ImageIcon importExport;
+ public static ImageIcon peerMonitor;
+ public static ImageIcon minPeerMonitor;
+
+
public static ImageIcon minImportAction;
public static ImageIcon minExportAction;
@@ -114,48 +118,51 @@
return new ImageIcon(url);
}
+
public static void loadIcons() {
- IconBox.blueBunny = IconBox.loadIcon("blueBunny.png");
- IconBox.connectAction = IconBox.loadIcon("connect.png");
- IconBox.minConnectAction = IconBox.loadIcon("min-connect.png");
- IconBox.disconnectAction = IconBox.loadIcon("disconnect.png");
- IconBox.queue = IconBox.loadIcon("connect.png");
- IconBox.minQueue = IconBox.loadIcon("min-connect.png");
- IconBox.insertions = IconBox.loadIcon("insertion.png");
- IconBox.minInsertions = IconBox.loadIcon("min-insertion.png");
- IconBox.minIndex = IconBox.loadIcon("min-index.png");
- IconBox.minIndexReadOnly =
IconBox.loadIcon("min-indexReadOnly.png");
- IconBox.indexNew = IconBox.loadIcon("index-new.png");
- IconBox.indexReuse = IconBox.loadIcon("indexReadOnly.png");
- IconBox.downloads = IconBox.loadIcon("download.png");
- IconBox.minDownloads = IconBox.loadIcon("min-download.png");
- IconBox.settings = IconBox.loadIcon("settings.png");
- IconBox.minSettings = IconBox.loadIcon("min-settings.png");
- IconBox.indexBrowser = IconBox.loadIcon("index.png");
- IconBox.minIndexBrowser = IconBox.loadIcon("min-index.png");
- IconBox.addToIndexAction = IconBox.loadIcon("add.png");
- IconBox.add = IconBox.loadIcon("add.png");
+ IconBox.blueBunny = IconBox.loadIcon("blueBunny.png");
+ IconBox.connectAction = IconBox.loadIcon("connect.png");
+ IconBox.minConnectAction =
IconBox.loadIcon("min-connect.png");
+ IconBox.disconnectAction = IconBox.loadIcon("disconnect.png");
+ IconBox.queue = IconBox.loadIcon("connect.png");
+ IconBox.minQueue =
IconBox.loadIcon("min-connect.png");
+ IconBox.insertions = IconBox.loadIcon("insertion.png");
+ IconBox.minInsertions =
IconBox.loadIcon("min-insertion.png");
+ IconBox.minIndex = IconBox.loadIcon("min-index.png");
+ IconBox.minIndexReadOnly =
IconBox.loadIcon("min-indexReadOnly.png");
+ IconBox.indexNew = IconBox.loadIcon("index-new.png");
+ IconBox.indexReuse =
IconBox.loadIcon("indexReadOnly.png");
+ IconBox.downloads = IconBox.loadIcon("download.png");
+ IconBox.minDownloads =
IconBox.loadIcon("min-download.png");
+ IconBox.settings = IconBox.loadIcon("settings.png");
+ IconBox.minSettings =
IconBox.loadIcon("min-settings.png");
+ IconBox.indexBrowser = IconBox.loadIcon("index.png");
+ IconBox.minIndexBrowser = IconBox.loadIcon("min-index.png");
+ IconBox.addToIndexAction = IconBox.loadIcon("add.png");
+ IconBox.add = IconBox.loadIcon("add.png");
IconBox.insertAndAddToIndexAction =
IconBox.loadIcon("index.png");
- IconBox.makeALinkAction = IconBox.loadIcon("makeLink.png");
- IconBox.reconnectAction = IconBox.loadIcon("refresh.png");
+ IconBox.makeALinkAction = IconBox.loadIcon("makeLink.png");
+ IconBox.reconnectAction = IconBox.loadIcon("refresh.png");
IconBox.minReconnectAction =
IconBox.loadIcon("min-refresh.png");
- IconBox.refreshAction = IconBox.loadIcon("refresh.png");
- IconBox.quitAction = IconBox.loadIcon("quit.png");
- IconBox.minQuitAction = IconBox.loadIcon("min-quit.png");
- IconBox.key = IconBox.loadIcon("key.png");
- IconBox.delete = IconBox.loadIcon("delete.png");
- IconBox.folderNew = IconBox.loadIcon("folder-new.png");
- IconBox.help = IconBox.loadIcon("help.png");
- IconBox.minHelp = IconBox.loadIcon("min-help.png");
- IconBox.mainWindow = IconBox.loadIcon("mainWindow.png");
- IconBox.terminal = IconBox.loadIcon("terminal.png");
- IconBox.minTerminal = IconBox.loadIcon("min-terminal.png");
- IconBox.remove = IconBox.loadIcon("remove.png");
- IconBox.queueWatcher = IconBox.loadIcon("queueWatcher.png");
- IconBox.importExport = IconBox.loadIcon("refresh.png");
- IconBox.minImportAction = IconBox.loadIcon("min-import.png");
- IconBox.minExportAction = IconBox.loadIcon("min-export.png");
- IconBox.database = IconBox.loadIcon("database.png");
+ IconBox.refreshAction = IconBox.loadIcon("refresh.png");
+ IconBox.quitAction = IconBox.loadIcon("quit.png");
+ IconBox.minQuitAction = IconBox.loadIcon("min-quit.png");
+ IconBox.key = IconBox.loadIcon("key.png");
+ IconBox.delete = IconBox.loadIcon("delete.png");
+ IconBox.folderNew = IconBox.loadIcon("folder-new.png");
+ IconBox.help = IconBox.loadIcon("help.png");
+ IconBox.minHelp = IconBox.loadIcon("min-help.png");
+ IconBox.mainWindow = IconBox.loadIcon("mainWindow.png");
+ IconBox.terminal = IconBox.loadIcon("terminal.png");
+ IconBox.minTerminal =
IconBox.loadIcon("min-terminal.png");
+ IconBox.remove = IconBox.loadIcon("remove.png");
+ IconBox.queueWatcher =
IconBox.loadIcon("queueWatcher.png");
+ IconBox.importExport = IconBox.loadIcon("refresh.png");
+ IconBox.minImportAction = IconBox.loadIcon("min-import.png");
+ IconBox.minExportAction = IconBox.loadIcon("min-export.png");
+ IconBox.database = IconBox.loadIcon("database.png");
+ IconBox.minPeerMonitor =
IconBox.loadIcon("min-peerMonitor.png");
+ IconBox.peerMonitor =
IconBox.loadIcon("peerMonitor.png");
}
}
Modified: trunk/apps/Thaw/src/thaw/core/Logger.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/Logger.java 2007-03-09 19:57:01 UTC (rev
12070)
+++ trunk/apps/Thaw/src/thaw/core/Logger.java 2007-03-09 20:13:38 UTC (rev
12071)
@@ -22,7 +22,7 @@
* 2 or more is recommanded.
* 4 or more is unhealthy
*/
- public final static int LOG_LEVEL = 2;
+ public final static int LOG_LEVEL = 5;
private static Vector logListeners = null;
Modified: trunk/apps/Thaw/src/thaw/core/PluginManager.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/PluginManager.java 2007-03-09 19:57:01 UTC
(rev 12070)
+++ trunk/apps/Thaw/src/thaw/core/PluginManager.java 2007-03-09 20:13:38 UTC
(rev 12071)
@@ -19,6 +19,7 @@
};
private final static String[] knownPlugins = {
+ "thaw.plugins.PeerMonitor",
"thaw.plugins.QueueWatcher",
"thaw.plugins.FetchPlugin",
"thaw.plugins.InsertPlugin",
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java 2007-03-09 19:57:01 UTC
(rev 12070)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java 2007-03-09 20:13:38 UTC
(rev 12071)
@@ -228,9 +228,7 @@
queueManager.getQueryManager().deleteObserver(this);
queueManager.getQueryManager().addObserver(this);
- queueManager.getQueryManager().writeMessage(queryMessage);
-
- return true;
+ return
queueManager.getQueryManager().writeMessage(queryMessage);
}
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java 2007-03-09 19:57:01 UTC
(rev 12070)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java 2007-03-09 20:13:38 UTC
(rev 12071)
@@ -255,7 +255,7 @@
status = "Waiting for socket availability";
- Logger.info(this, "Another file is being uploaded ... waiting
...");
+ Logger.info(this, "Waiting for socket availability ...");
final Thread fork = new Thread(new UnlockWaiter(this,
connection));
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPConnection.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPConnection.java 2007-03-09 19:57:01 UTC
(rev 12070)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPConnection.java 2007-03-09 20:13:38 UTC
(rev 12071)
@@ -14,12 +14,12 @@
* After being instanciated, you should commit it to the FCPQueryManager, and
then
* commit the FCPQueryManager to the FCPQueueManager.
* Call observer when connected / disconnected.<br/>
- * WARNING: This FCP implement don't guarantee that messages are sent in the
same order than initally put
+ * WARNING: This FCP implementation doesn't guarantee that messages are sent
in the same order than initally put
* if the lock on writting is not set !<br/>
- * TODO: Add functions socketToStream(long size, OutputStream file) /
streamToSocket(InputStream file)
*/
public class FCPConnection extends Observable {
- /** If == true, then will print on stdout
+ /**
+ * If == true, then will print on stdout
* all fcp input / output.
*/
private final static boolean DEBUG_MODE = true;
Modified: trunk/apps/Thaw/src/thaw/gui/MDNSDiscoveryPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/gui/MDNSDiscoveryPanel.java 2007-03-09
19:57:01 UTC (rev 12070)
+++ trunk/apps/Thaw/src/thaw/gui/MDNSDiscoveryPanel.java 2007-03-09
20:13:38 UTC (rev 12071)
@@ -12,7 +12,8 @@
import javax.jmdns.ServiceInfo;
import javax.jmdns.ServiceListener;
import javax.swing.DefaultListModel;
-import javax.swing.GroupLayout;
+import java.awt.GridLayout;
+import java.awt.BorderLayout;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JList;
@@ -27,17 +28,17 @@
/**
* This panel implements Zeroconf (called Bonjour/RendezVous by apple)
discovery for Thaw
- *
+ *
* WARNING: for it to work, you must have a running freenet node on the same
network subnet, using the MDNSDiscovery panel
- *
+ *
* @author Florent Daignière <nextgens at freenetproject.org>
*
* @see http://wiki.freenetproject.org/MDNSDiscoverypanel
- *
+ *
* @see http://www.dns-sd.org/ServiceTypes.html
* @see http://www.multicastdns.org/
- * @see http://jmdns.sourceforge.net/
- *
+ * @see http://jmdns.sourceforge.net/
+ *
* TODO: implement the "Manual" mode
* TODO: maybe we should have a small progressbar shown in a new popup to
introduce a "delay" at startup
*/
@@ -74,7 +75,7 @@
throw new RuntimeException("Error loading
MDNSDiscoveryPanel : " + e.getMessage());
}
- // The UI
+ // The UI
panel = new JScrollPane();
progressBar = new JProgressBar(0, 30);
list = new JList();
@@ -87,34 +88,15 @@
list.setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION);
list.addListSelectionListener(this);
- panel.setViewportView(list);
-
label.setText("Select the freenet node you want to connect to
from the list below :");
- panel.add(progressBar);
+ panel.setLayout(new BorderLayout());
+ panel.add(label, BorderLayout.NORTH);
+ panel.add(list, BorderLayout.CENTER);
+ panel.add(progressBar, BorderLayout.SOUTH);
- GroupLayout layout = new GroupLayout(this.getContentPane());
+ setContentPane(panel);
- getContentPane().setLayout(layout);
- layout.setHorizontalGroup(
-
layout.createParallelGroup(GroupLayout.Alignment.LEADING)
- .addGroup(layout.createSequentialGroup()
- .addContainerGap()
- .addComponent(label,
GroupLayout.PREFERRED_SIZE, 430, GroupLayout.PREFERRED_SIZE))
-
.addGroup(layout.createSequentialGroup()
- .addGap(36, 36,
36)
-
.addComponent(panel, GroupLayout.PREFERRED_SIZE, 380,
GroupLayout.PREFERRED_SIZE))
- );
- layout.setVerticalGroup(
-
layout.createParallelGroup(GroupLayout.Alignment.LEADING)
- .addGroup(layout.createSequentialGroup()
- .addGap(7, 7, 7)
- .addComponent(label)
-
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(panel,
GroupLayout.PREFERRED_SIZE, 70, GroupLayout.PREFERRED_SIZE)
-
.addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
- );
-
pack();
super.setAlwaysOnTop(true);
super.setLocationRelativeTo(this.getParent());
@@ -125,6 +107,7 @@
Logger.notice(this, "The configuration file doesn't seems to be
valid... MDNSDiscovery is starting!");
}
+
private class FCPMDNSListener implements ServiceListener {
private final MDNSDiscoveryPanel panel;
@@ -190,7 +173,7 @@
while(goon) {
try {
synchronized (this) {
- wait(Long.MAX_VALUE);
+ wait(Long.MAX_VALUE);
}
} catch (InterruptedException e) {}
Modified: trunk/apps/Thaw/src/thaw/i18n/thaw.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/thaw.properties 2007-03-09 19:57:01 UTC
(rev 12070)
+++ trunk/apps/Thaw/src/thaw/i18n/thaw.properties 2007-03-09 20:13:38 UTC
(rev 12071)
@@ -299,3 +299,6 @@
thaw.plugin.index.sortAlphabetically=Sort by alphabetic order
thaw.plugin.index.loadOnTheFly=Load the index tree on the fly (means less
memory consumption but more CPU usage)
+
+
+thaw.plugin.peerMonitor.peerMonitor=Peer management
Modified: trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties 2007-03-09 19:57:01 UTC
(rev 12070)
+++ trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties 2007-03-09 20:13:38 UTC
(rev 12071)
@@ -234,3 +234,4 @@
thaw.plugin.index.addAlreadyExistingIndex=Ajouter un index d?j? pr?sent sur
Freenet
+thaw.plugin.peerMonitor.peerMonitor=Gestion des peers
Added: trunk/apps/Thaw/src/thaw/plugins/peerMonitor/PeerMonitorPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/peerMonitor/PeerMonitorPanel.java
(rev 0)
+++ trunk/apps/Thaw/src/thaw/plugins/peerMonitor/PeerMonitorPanel.java
2007-03-09 20:13:38 UTC (rev 12071)
@@ -0,0 +1,43 @@
+package thaw.plugins.peerMonitor;
+
+import javax.swing.JPanel;
+import javax.swing.JTextArea;
+import javax.swing.JScrollPane;
+import javax.swing.JList;
+import javax.swing.JLabel;
+
+import java.awt.BorderLayout;
+import java.awt.GridLayout;
+
+import thaw.core.Config;
+
+
+public class PeerMonitorPanel
+{
+ private JPanel panel;
+
+ private JPanel mainPanel;
+
+ private JList peerList;
+
+
+ public PeerMonitorPanel(Config config) {
+ panel = new JPanel(new BorderLayout());
+
+ peerList = new JList();
+
+ mainPanel = new JPanel(new GridLayout(2, 1));
+
+ mainPanel.add(new JLabel("*Put the node ref here*"));
+ mainPanel.add(new JLabel("*Put details about the peer here*"));
+
+ panel.add(mainPanel, BorderLayout.CENTER);
+ panel.add(peerList, BorderLayout.EAST);
+ }
+
+
+ public JPanel getPanel() {
+ return panel;
+ }
+
+}
