Author: jflesch
Date: 2008-01-17 16:57:44 +0000 (Thu, 17 Jan 2008)
New Revision: 17098
Modified:
trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java
trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java
trunk/apps/Thaw/src/thaw/plugins/index/IndexFolder.java
trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessageTreeTable.java
trunk/apps/Thaw/src/thaw/plugins/miniFrost/Outbox.java
trunk/apps/Thaw/src/thaw/plugins/miniFrost/SentMessages.java
trunk/apps/Thaw/src/thaw/plugins/peerMonitor/PeerMonitorPanel.java
Log:
FCP : Should fix the memory leak once for all : Was due to FCPTransferQuerys
staying observers of the FCPQueryManager even when they were finished
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java 2008-01-17 16:47:50 UTC
(rev 17097)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java 2008-01-17 16:57:44 UTC
(rev 17098)
@@ -910,8 +910,10 @@
return stop(queueManager, true);
}
- public boolean stop(final FCPQueueManager queryManager, boolean notify)
{
+ public boolean stop(final FCPQueueManager queueManager, boolean notify)
{
Logger.info(this, "Stop fetching of the key : "+getFileKey());
+
+ queueManager.getQueryManager().deleteObserver(this);
if(isPersistent() && !removeRequest())
return false;
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java 2008-01-17 16:47:50 UTC
(rev 17097)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java 2008-01-17 16:57:44 UTC
(rev 17098)
@@ -513,6 +513,8 @@
public boolean stop(final FCPQueueManager queueManager) {
if(removeRequest()) {
+ queueManager.getQueryManager().deleteObserver(this);
+
boolean wasFinished = isFinished();
status = "Stopped";
Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexFolder.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexFolder.java 2008-01-17
16:47:50 UTC (rev 17097)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexFolder.java 2008-01-17
16:57:44 UTC (rev 17098)
@@ -1078,10 +1078,12 @@
return toString();
}
+
+ private final static String yourIndexesStr =
thaw.core.I18n.getMessage("thaw.plugin.index.yourIndexes");
public String toString() {
if (id < 0)
- return
thaw.core.I18n.getMessage("thaw.plugin.index.yourIndexes");
+ return yourIndexesStr;
if (name != null)
return name;
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessageTreeTable.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessageTreeTable.java
2008-01-17 16:47:50 UTC (rev 17097)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessageTreeTable.java
2008-01-17 16:57:44 UTC (rev 17098)
@@ -140,6 +140,8 @@
/** for the thread tree **/
private MessageNodeTree messageNodeTree;
+
+ private final static String trustLevelNoneStr =
I18n.getMessage("thaw.plugin.signature.trustLevel.none");
public MessageTreeTable(MiniFrostPanel mainPanel) {
@@ -606,7 +608,7 @@
if (author != null && author.getIdentity() !=
null)
value =
author.getIdentity().getTrustLevelStr();
else
- value =
I18n.getMessage("thaw.plugin.signature.trustLevel.none");
+ value = trustLevelNoneStr;
}
if (value instanceof java.util.Date) {
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/Outbox.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/Outbox.java 2008-01-17
16:47:50 UTC (rev 17097)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/Outbox.java 2008-01-17
16:57:44 UTC (rev 17098)
@@ -181,9 +181,11 @@
return msgs;
}
+
+ private final static String outboxStr =
I18n.getMessage("thaw.plugin.miniFrost.outbox");
public String getName() {
- return I18n.getMessage("thaw.plugin.miniFrost.outbox");
+ return outboxStr;
}
public int getNewMessageNumber(boolean unsigned, boolean archived, int
minTrustLevel) {
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/SentMessages.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/SentMessages.java
2008-01-17 16:47:50 UTC (rev 17097)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/SentMessages.java
2008-01-17 16:57:44 UTC (rev 17098)
@@ -20,9 +20,11 @@
public SentMessages(MiniFrost miniFrost) {
this.miniFrost = miniFrost;
}
+
+ private final static String sentBoxStr =
I18n.getMessage("thaw.plugin.miniFrost.sentBox");
public String getName() {
- return I18n.getMessage("thaw.plugin.miniFrost.sentBox");
+ return sentBoxStr;
}
/**
Modified: trunk/apps/Thaw/src/thaw/plugins/peerMonitor/PeerMonitorPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/peerMonitor/PeerMonitorPanel.java
2008-01-17 16:47:50 UTC (rev 17097)
+++ trunk/apps/Thaw/src/thaw/plugins/peerMonitor/PeerMonitorPanel.java
2008-01-17 16:57:44 UTC (rev 17098)
@@ -97,8 +97,13 @@
private ToolbarModifier toolbarModifier;
private JButton foldButton;
+
+ private final static String nodeMemoryStr =
I18n.getMessage("thaw.plugin.peerMonitor.infos.nodeMemory");
+ private final static String thawMemoryStr =
I18n.getMessage("thaw.plugin.peerMonitor.infos.thawMemory");
+ private final static String nodeThreadsStr =
I18n.getMessage("thaw.plugin.peerMonitor.infos.nodeThreads");
+ private final static String thawThreadsStr =
I18n.getMessage("thaw.plugin.peerMonitor.infos.thawThreads");
+ private final static String nodeStatsStr =
I18n.getMessage("thaw.plugin.peerMonitor.nodeStats");
-
public PeerMonitorPanel(PeerMonitor peerMonitor,
FCPQueueManager queueManager,
Config config,
@@ -256,7 +261,7 @@
pourcent = (int)((used * 100) / max);
-
nodeMemBar.setString(I18n.getMessage("thaw.plugin.peerMonitor.infos.nodeMemory")+
": "
+ nodeMemBar.setString(nodeMemoryStr+ ": "
+ GUIHelper.getPrintableSize(used)
+ " / "
+ GUIHelper.getPrintableSize(max));
@@ -276,7 +281,7 @@
pourcent = (int)((used * 100) / max);
-
thawMemBar.setString(I18n.getMessage("thaw.plugin.peerMonitor.infos.thawMemory")+
": "
+ thawMemBar.setString(thawMemoryStr+ ": "
+ GUIHelper.getPrintableSize(used)
+ " / "
+ GUIHelper.getPrintableSize(max));
@@ -286,9 +291,9 @@
public void setNmbThreads(int nmbNodeThreads) {
-
nodeThreads.setText(I18n.getMessage("thaw.plugin.peerMonitor.infos.nodeThreads")
+ nodeThreads.setText(nodeThreadsStr
+ " : "+ Integer.toString(nmbNodeThreads));
-
thawThreads.setText(I18n.getMessage("thaw.plugin.peerMonitor.infos.thawThreads")
+ thawThreads.setText(thawThreadsStr
+ " : "+
Integer.toString(Thread.activeCount()));
}
@@ -355,7 +360,7 @@
{
peers = new Vector();
- peers.add(I18n.getMessage("thaw.plugin.peerMonitor.nodeStats"));
+ peers.add(nodeStatsStr);
/* TODO : dirty : should use comparator, etc */
for (int i = 0 ; i < STR_STATUS.length ; i++) {
@@ -398,8 +403,6 @@
}
}
-
-
/**
* @return null if it must not be displayed ; else an array with two
elements (key translated + value translated)
*/
