Author: jflesch
Date: 2007-03-11 12:23:36 +0000 (Sun, 11 Mar 2007)
New Revision: 12098
Modified:
trunk/apps/Thaw/src/thaw/gui/GUIHelper.java
trunk/apps/Thaw/src/thaw/i18n/thaw.properties
trunk/apps/Thaw/src/thaw/plugins/index/FileTable.java
trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
trunk/apps/Thaw/src/thaw/plugins/index/LinkTable.java
trunk/apps/Thaw/src/thaw/plugins/peerMonitor/PeerMonitorPanel.java
trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueuePanel.java
trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
Log:
Implements memory monitor (inside PeerMonitor) and PeerMonitor displays now the
node reference
Modified: trunk/apps/Thaw/src/thaw/gui/GUIHelper.java
===================================================================
--- trunk/apps/Thaw/src/thaw/gui/GUIHelper.java 2007-03-11 00:11:08 UTC (rev
12097)
+++ trunk/apps/Thaw/src/thaw/gui/GUIHelper.java 2007-03-11 12:23:36 UTC (rev
12098)
@@ -2,6 +2,8 @@
import java.awt.Toolkit;
import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.ClipboardOwner;
+import java.awt.datatransfer.StringSelection;
import java.awt.datatransfer.DataFlavor;
import java.awt.datatransfer.Transferable;
import java.awt.event.ActionEvent;
@@ -11,6 +13,7 @@
import javax.swing.text.JTextComponent;
import thaw.core.Logger;
+import thaw.core.I18n;
public class GUIHelper {
@@ -56,4 +59,35 @@
}
}
+
+ public static void copyToClipboard(final String str) {
+ final Toolkit tk = Toolkit.getDefaultToolkit();
+ final StringSelection st = new StringSelection(str);
+ final Clipboard cp = tk.getSystemClipboard();
+ cp.setContents(st, null);
+ }
+
+
+
+ public static String getPrintableSize(final long size) {
+ if(size == 0)
+ return I18n.getMessage("thaw.common.unknown");
+
+ if(size < 1024) /* < 1KB */
+ return ((new Long(size)).toString() + " B");
+
+ if(size < 1048576) { /* < 1MB */
+ final long kb = size / 1024;
+ return ((new Long(kb)).toString() + " KiB");
+ }
+
+ if(size < 1073741824) { /* < 1GB */
+ final long mb = size / 1048576;
+ return ((new Long(mb)).toString() + " MiB");
+ }
+
+ final long gb = size / 1073741824;
+
+ return ((new Long(gb)).toString() +" GiB");
+ }
}
Modified: trunk/apps/Thaw/src/thaw/i18n/thaw.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/thaw.properties 2007-03-11 00:11:08 UTC
(rev 12097)
+++ trunk/apps/Thaw/src/thaw/i18n/thaw.properties 2007-03-11 12:23:36 UTC
(rev 12098)
@@ -306,6 +306,8 @@
thaw.plugin.peerMonitor.peerMonitor=Peer management
+thaw.plugin.peerMonitor.yourReference=Your reference:
+thaw.plugin.peerMonitor.copyReference=Copy your reference to the clipboard
thaw.zeroconf.searchingNode=Searching freenet nodes ...
Modified: trunk/apps/Thaw/src/thaw/plugins/index/FileTable.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/FileTable.java 2007-03-11
00:11:08 UTC (rev 12097)
+++ trunk/apps/Thaw/src/thaw/plugins/index/FileTable.java 2007-03-11
12:23:36 UTC (rev 12098)
@@ -464,7 +464,7 @@
if(value instanceof Long) {
cell =
super.getTableCellRendererComponent(table,
-
thaw.plugins.queueWatcher.QueueTableModel.getPrintableSize(((Long)value).longValue()),
+
thaw.gui.GUIHelper.getPrintableSize(((Long)value).longValue()),
isSelected, hasFocus, row, column);
} else {
Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
2007-03-11 00:11:08 UTC (rev 12097)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
2007-03-11 12:23:36 UTC (rev 12098)
@@ -850,10 +850,7 @@
if (node == null)
return;
- final Toolkit tk = Toolkit.getDefaultToolkit();
- final StringSelection st = new
StringSelection(node.getPublicKey());
- final Clipboard cp = tk.getSystemClipboard();
- cp.setContents(st, null);
+ thaw.gui.GUIHelper.copyToClipboard(node.getPublicKey());
}
Modified: trunk/apps/Thaw/src/thaw/plugins/index/LinkTable.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/LinkTable.java 2007-03-11
00:11:08 UTC (rev 12097)
+++ trunk/apps/Thaw/src/thaw/plugins/index/LinkTable.java 2007-03-11
12:23:36 UTC (rev 12098)
@@ -321,7 +321,7 @@
if(value instanceof Long)
cell =
super.getTableCellRendererComponent(table,
-
thaw.plugins.queueWatcher.QueueTableModel.getPrintableSize(((Long)value).longValue()),
+
thaw.gui.GUIHelper.getPrintableSize(((Long)value).longValue()),
isSelected, hasFocus, row, column);
else
cell =
super.getTableCellRendererComponent(table, value,
Modified: trunk/apps/Thaw/src/thaw/plugins/peerMonitor/PeerMonitorPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/peerMonitor/PeerMonitorPanel.java
2007-03-11 00:11:08 UTC (rev 12097)
+++ trunk/apps/Thaw/src/thaw/plugins/peerMonitor/PeerMonitorPanel.java
2007-03-11 12:23:36 UTC (rev 12098)
@@ -5,39 +5,96 @@
import javax.swing.JScrollPane;
import javax.swing.JList;
import javax.swing.JLabel;
+import javax.swing.JProgressBar;
+import javax.swing.JButton;
+import java.awt.event.ActionListener;
+import java.awt.event.ActionEvent;
import java.awt.BorderLayout;
import java.awt.GridLayout;
import thaw.core.Config;
+import thaw.core.I18n;
-
-public class PeerMonitorPanel
+public class PeerMonitorPanel implements ActionListener
{
private JPanel panel;
-
private JPanel mainPanel;
+ private JLabel refLabel;
+ private JTextArea refArea;
+ private JButton refCopyButton;
+
private JList peerList;
+ private JProgressBar memBar;
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*"));
+
+ JPanel refPanel = new JPanel(new BorderLayout());
+ JPanel refTitle = new JPanel(new BorderLayout());
+
+ refLabel = new
JLabel(I18n.getMessage("thaw.plugin.peerMonitor.yourReference"));
+ refCopyButton = new
JButton(I18n.getMessage("thaw.plugin.peerMonitor.copyReference"));
+ refCopyButton.addActionListener(this);
+
+ refTitle.add(refLabel, BorderLayout.CENTER);
+ refTitle.add(refCopyButton, BorderLayout.EAST);
+
+ refArea = new JTextArea("*Put the node ref here*");
+ refArea.setEditable(false);
+
+ refPanel.add(refTitle, BorderLayout.NORTH);
+ refPanel.add(refArea, BorderLayout.CENTER);
+
+ mainPanel.add(refPanel);
mainPanel.add(new JLabel("*Put details about the peer here*"));
+ memBar = new JProgressBar(0, 100);
+ setMemBar(0, 134217728);
+ memBar.setStringPainted(true);
+
panel.add(mainPanel, BorderLayout.CENTER);
panel.add(peerList, BorderLayout.EAST);
+ panel.add(memBar, BorderLayout.SOUTH);
}
+ public void setMemBar(long used, long max) {
+ int pourcent;
+
+ pourcent = (int)((used * 100) / max);
+
+ memBar.setString("Used memory : "
+ + thaw.gui.GUIHelper.getPrintableSize(used)
+ + " / "
+ + thaw.gui.GUIHelper.getPrintableSize(max)
+ + " ("+Integer.toString(pourcent)+"%)");
+
+ memBar.setValue(pourcent);
+ }
+
+ public void setRef(String ref) {
+ refArea.setText(ref);
+ }
+
+
public JPanel getPanel() {
return panel;
}
+
+ public void actionPerformed(ActionEvent e) {
+ if (e.getSource() == refCopyButton) {
+ thaw.gui.GUIHelper.copyToClipboard(refArea.getText());
+ }
+
+ }
}
Modified: trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueuePanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueuePanel.java
2007-03-11 00:11:08 UTC (rev 12097)
+++ trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueuePanel.java
2007-03-11 12:23:36 UTC (rev 12098)
@@ -393,7 +393,7 @@
}
- public class ActionReplier implements Runnable, ClipboardOwner {
+ public class ActionReplier implements Runnable {
private int action;
private int new_priority;
private Vector queries;
@@ -410,8 +410,6 @@
}
public void run() {
-
- final Toolkit tk = Toolkit.getDefaultToolkit();
String keys = "";
File dir = null;
@@ -510,16 +508,11 @@
if (action == ACTION_COPY_KEYS_SELECTED) {
- final StringSelection st = new
StringSelection(keys);
- final Clipboard cp = tk.getSystemClipboard();
- cp.setContents(st, this);
+ thaw.gui.GUIHelper.copyToClipboard(keys);
}
}
- public void lostOwnership(final Clipboard clipboard, final
java.awt.datatransfer.Transferable contents) {
- /* we dont care */
- }
}
Modified: trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
2007-03-11 00:11:08 UTC (rev 12097)
+++ trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
2007-03-11 12:23:36 UTC (rev 12098)
@@ -90,28 +90,6 @@
}
- public static String getPrintableSize(final long size) {
- if(size == 0)
- return I18n.getMessage("thaw.common.unknown");
-
- if(size < 1024) /* < 1KB */
- return ((new Long(size)).toString() + " B");
-
- if(size < 1048576) { /* < 1MB */
- final long kb = size / 1024;
- return ((new Long(kb)).toString() + " KB");
- }
-
- if(size < 1073741824) { /* < 1GB */
- final long mb = size / 1048576;
- return ((new Long(mb)).toString() + " MB");
- }
-
- final long gb = size / 1073741824;
-
- return ((new Long(gb)).toString() +" GB");
- }
-
public Object getValueAt(final int row, final int column) {
if(row >= queries.size())
return null;
@@ -122,7 +100,7 @@
return query.getFilename();
if(column == 1)
- return
QueueTableModel.getPrintableSize(query.getFileSize());
+ return
thaw.gui.GUIHelper.getPrintableSize(query.getFileSize());
if(!isForInsertions && (column == 2)) {
if(query.getPath() != null)
