Author: jflesch
Date: 2007-08-27 23:37:38 +0000 (Mon, 27 Aug 2007)
New Revision: 14894
Modified:
trunk/apps/Thaw/src/thaw/fcp/FCPGetNode.java
trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties
trunk/apps/Thaw/src/thaw/i18n/thaw.properties
trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties
trunk/apps/Thaw/src/thaw/plugins/peerMonitor/PeerMonitorPanel.java
Log:
Don't display anymore the node reference in the peer monitor panel
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPGetNode.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPGetNode.java 2007-08-27 23:04:40 UTC
(rev 14893)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPGetNode.java 2007-08-27 23:37:38 UTC
(rev 14894)
@@ -86,8 +86,6 @@
|| !msg.getMessageName().equals("NodeData"))
return;
- Logger.info(this, msg.toString());
-
ref = "";
for (int i = 0 ; i < refElements.length ; i++) {
Modified: trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties 2007-08-27
23:04:40 UTC (rev 14893)
+++ trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties 2007-08-27
23:37:38 UTC (rev 14894)
@@ -421,7 +421,7 @@
thaw.plugin.peerMonitor.yourReference=Votre r?f?rence:
thaw.plugin.peerMonitor.copyReference=Copier votre r?f?rence vers le
presse-papier
thaw.plugin.peerMonitor.nodeStats=Votre noeud
-thaw.plugin.peerMonitor.peerList=Peers:
+thaw.plugin.peerMonitor.peerList=Peers
thaw.plugin.peerMonitor.nodeInfos=Informations sur votre noeud :
thaw.plugin.peerMonitor.peerInfos=Informations relatives au peer
@@ -453,6 +453,18 @@
thaw.plugin.peerMonitor.invalidRef=Reference invalide. D?sol?.
+thaw.plugin.peerMonitor.infos.totalInputBytes=Total des donn?es re?ues
+thaw.plugin.peerMonitor.infos.totalOutputBytes=Total des donn?es envoy?es
+thaw.plugin.peerMonitor.infos.backedOffPercent=Pourcentage de saturation
+thaw.plugin.peerMonitor.infos.swapPerMinute=?changes par minute
+thaw.plugin.peerMonitor.infos.locationChangePerMinute=Changement de place par
minute
+
+thaw.plugin.peerMonitor.infos.peer.totalBytesOut=Total des donn?es envoy?es ?
ce peer
+thaw.plugin.peerMonitor.infos.peer.totalBytesIn=Total des donn?es recues de ce
peer
+thaw.plugin.peerMonitor.infos.peer.overloadProbability=Probabilit? de
saturation
+
+
+
# Theme selector
thaw.plugin.themeSelector.themeSelector=S?lecteur de th?me
Modified: trunk/apps/Thaw/src/thaw/i18n/thaw.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/thaw.properties 2007-08-27 23:04:40 UTC
(rev 14893)
+++ trunk/apps/Thaw/src/thaw/i18n/thaw.properties 2007-08-27 23:37:38 UTC
(rev 14894)
@@ -431,7 +431,7 @@
thaw.plugin.peerMonitor.yourReference=Your reference:
thaw.plugin.peerMonitor.copyReference=Copy your reference to the clipboard
thaw.plugin.peerMonitor.nodeStats=Your node
-thaw.plugin.peerMonitor.peerList=Peers:
+thaw.plugin.peerMonitor.peerList=Peers
thaw.plugin.peerMonitor.nodeInfos=Node informations:
thaw.plugin.peerMonitor.peerInfos=Informations relative to peer
@@ -462,12 +462,26 @@
thaw.plugin.peerMonitor.invalidRef=Invalid reference, sorry.
thaw.plugin.peerMonitor.confirmationForRemove=Are you sure that you want to
remove this peer ?
+thaw.plugin.peerMonitor.infos.totalInputBytes=Total input
+thaw.plugin.peerMonitor.infos.totalOutputBytes=Total output
+thaw.plugin.peerMonitor.infos.backedOffPercent=Backed off percent
+thaw.plugin.peerMonitor.infos.swapPerMinute=Swaps per minute
+thaw.plugin.peerMonitor.infos.locationChangePerMinute=Location change per
minute
+thaw.plugin.peerMonitor.infos.peer.totalBytesOut=Total output to this peer
+thaw.plugin.peerMonitor.infos.peer.totalBytesIn=Total input from this peer
+thaw.plugin.peerMonitor.infos.peer.overloadProbability=Overload probability
+
+
+
+## Theme selector
+
thaw.plugin.themeSelector.themeSelector=Theme selector
thaw.plugin.themeSelector.selectATheme=Select a theme:
thaw.plugin.themeSelector.theme=Theme
+## Signature
thaw.plugin.signature.signatures=Identities
thaw.plugin.signature.pluginName=Signature management
Modified: trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties 2007-08-27 23:04:40 UTC
(rev 14893)
+++ trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties 2007-08-27 23:37:38 UTC
(rev 14894)
@@ -411,13 +411,17 @@
thaw.plugin.index.recentlyAdded=R\u00e9cemment ajout\u00e9s
+thaw.plugins.index.newThawVersion=Une nouvelle version de Thaw est disponible
: X
+
+
+
# Peer monitor
thaw.plugin.peerMonitor.peerMonitor=Connexion
thaw.plugin.peerMonitor.yourReference=Votre r\u00e9f\u00e9rence:
thaw.plugin.peerMonitor.copyReference=Copier votre r\u00e9f\u00e9rence vers le
presse-papier
thaw.plugin.peerMonitor.nodeStats=Votre noeud
-thaw.plugin.peerMonitor.peerList=Peers:
+thaw.plugin.peerMonitor.peerList=Peers
thaw.plugin.peerMonitor.nodeInfos=Informations sur votre noeud :
thaw.plugin.peerMonitor.peerInfos=Informations relatives au peer
@@ -449,6 +453,18 @@
thaw.plugin.peerMonitor.invalidRef=Reference invalide. D\u00e9sol\u00e9.
+thaw.plugin.peerMonitor.infos.totalInputBytes=Total des donn\u00e9es
re\u00e7ues
+thaw.plugin.peerMonitor.infos.totalOutputBytes=Total des donn\u00e9es
envoy\u00e9es
+thaw.plugin.peerMonitor.infos.backedOffPercent=Pourcentage de saturation
+thaw.plugin.peerMonitor.infos.swapPerMinute=\u00c9changes par minute
+thaw.plugin.peerMonitor.infos.locationChangePerMinute=Changement de place par
minute
+
+thaw.plugin.peerMonitor.infos.peer.totalBytesOut=Total des donn\u00e9es
envoy\u00e9es \u00e0 ce peer
+thaw.plugin.peerMonitor.infos.peer.totalBytesIn=Total des donn\u00e9es recues
de ce peer
+thaw.plugin.peerMonitor.infos.peer.overloadProbability=Probabilit\u00e9 de
saturation
+
+
+
# Theme selector
thaw.plugin.themeSelector.themeSelector=S\u00e9lecteur de th\u00e8me
Modified: trunk/apps/Thaw/src/thaw/plugins/peerMonitor/PeerMonitorPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/peerMonitor/PeerMonitorPanel.java
2007-08-27 23:04:40 UTC (rev 14893)
+++ trunk/apps/Thaw/src/thaw/plugins/peerMonitor/PeerMonitorPanel.java
2007-08-27 23:37:38 UTC (rev 14894)
@@ -47,6 +47,7 @@
import thaw.fcp.FCPQueueManager;
import thaw.gui.IconBox;
+import thaw.gui.GUIHelper;
/**
* In fact, here is two panels : A panel with the peer list
@@ -271,9 +272,9 @@
pourcent = (int)((used * 100) / max);
nodeMemBar.setString(I18n.getMessage("thaw.plugin.peerMonitor.infos.nodeMemory")+
": "
- + thaw.gui.GUIHelper.getPrintableSize(used)
+ + GUIHelper.getPrintableSize(used)
+ " / "
- +
thaw.gui.GUIHelper.getPrintableSize(max));
+ + GUIHelper.getPrintableSize(max));
nodeMemBar.setValue(pourcent);
@@ -291,9 +292,9 @@
pourcent = (int)((used * 100) / max);
thawMemBar.setString(I18n.getMessage("thaw.plugin.peerMonitor.infos.thawMemory")+
": "
- + thaw.gui.GUIHelper.getPrintableSize(used)
+ + GUIHelper.getPrintableSize(used)
+ " / "
- +
thaw.gui.GUIHelper.getPrintableSize(max));
+ + GUIHelper.getPrintableSize(max));
thawMemBar.setValue(pourcent);
}
@@ -429,7 +430,7 @@
value + "%"
};
- else if ("version".equals(key))
+ else if ("version".equals(key)) /* used also for the node */
result = new String[] {
I18n.getMessage("thaw.plugin.peerMonitor.infos.peer.version"),
value
@@ -448,13 +449,13 @@
};
- else if ("physical.udp".equals(key))
+ else if ("physical.udp".equals(key)) /* used also for the node
*/
result = new String[] {
I18n.getMessage("thaw.plugin.peerMonitor.infos.peer.physical.udp"),
value
};
- else if ("volatile.averagePingTime".equals(key))
+ else if ("volatile.averagePingTime".equals(key)) /* used also
for the node */
result = new String[] {
I18n.getMessage("thaw.plugin.peerMonitor.infos.peer.averagePingTime"),
Integer.toString(new Float(value).intValue()) +
" ms"
@@ -463,21 +464,42 @@
else if ("volatile.idle".equals(key))
result = new String[] {
I18n.getMessage("thaw.plugin.peerMonitor.infos.peer.idle"),
- "~" +
thaw.gui.GUIHelper.getPrintableTime(Long.parseLong(value) / 1000)
+ "~" +
GUIHelper.getPrintableTime(Long.parseLong(value) / 1000)
};
+ else if ("volatile.totalBytesOut".equals(key)) {
+ result = new String[] {
+
I18n.getMessage("thaw.plugin.peerMonitor.infos.peer.totalBytesOut"),
+ "~" +
GUIHelper.getPrintableSize(Long.parseLong(value))
+ };
+ }
+
+ else if ("volatile.totalBytesIn".equals(key)) {
+ result = new String[] {
+
I18n.getMessage("thaw.plugin.peerMonitor.infos.peer.totalBytesIn"),
+ "~" +
GUIHelper.getPrintableSize(Long.parseLong(value))
+ };
+ }
+
+ else if ("volatile.overloadProbability".equals(key)) {
+ result = new String[] {
+
I18n.getMessage("thaw.plugin.peerMonitor.infos.peer.overloadProbability"),
+ value
+ };
+ }
+
/* NODE */
else if ("volatile.overallSize".equals(key))
result = new String[] {
I18n.getMessage("thaw.plugin.peerMonitor.infos.node.overallSize"),
- "~" +
thaw.gui.GUIHelper.getPrintableSize(Long.parseLong(value))
+ "~" +
GUIHelper.getPrintableSize(Long.parseLong(value))
};
else if ("volatile.uptimeSeconds".equals(key)) {
result = new String[] {
I18n.getMessage("thaw.plugin.peerMonitor.infos.node.uptimeSeconds"),
- "~" +
thaw.gui.GUIHelper.getPrintableTime(Long.parseLong(value))
+ "~" +
GUIHelper.getPrintableTime(Long.parseLong(value))
};
}
@@ -502,6 +524,50 @@
};
}
+ else if ("volatile.totalInputBytes".equals(key)) {
+
+ result = new String[] {
+
I18n.getMessage("thaw.plugin.peerMonitor.infos.totalInputBytes"),
+
GUIHelper.getPrintableSize(Long.parseLong(value))
+ };
+ }
+
+ else if ("volatile.backedOffPercent".equals(key)) {
+
+ result = new String[] {
+
I18n.getMessage("thaw.plugin.peerMonitor.infos.backedOffPercent"),
+ value + "%"
+ };
+ }
+
+ else if ("volatile.totalOutputBytes".equals(key)) {
+
+ result = new String[] {
+
I18n.getMessage("thaw.plugin.peerMonitor.infos.totalOutputBytes"),
+
GUIHelper.getPrintableSize(Long.parseLong(value))
+ };
+
+ }
+
+ else if ("volatile.swapsPerMinute".equals(key)) {
+
+ result = new String[] {
+
I18n.getMessage("thaw.plugin.peerMonitor.infos.swapPerMinute"),
+ value
+ };
+
+ }
+
+ else if ("volatile.locationChangePerMinute".equals(key)) {
+
+ result = new String[] {
+
I18n.getMessage("thaw.plugin.peerMonitor.infos.locationChangePerMinute"),
+ value
+ };
+
+ }
+
+
/*
if (advanced) {
if (result == null)
