Author: jflesch
Date: 2008-01-19 00:13:49 +0000 (Sat, 19 Jan 2008)
New Revision: 17162
Modified:
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/gui/GUIHelper.java
trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKMessage.java
Log:
Fixing NPEs in PluginManager
Modified: trunk/apps/Thaw/src/thaw/core/PluginManager.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/PluginManager.java 2008-01-19 00:02:16 UTC
(rev 17161)
+++ trunk/apps/Thaw/src/thaw/core/PluginManager.java 2008-01-19 00:13:49 UTC
(rev 17162)
@@ -97,13 +97,16 @@
final Iterator pluginIt = pluginNames.iterator();
final int progressJump = (100-40) / pluginNames.size();
- core.getSplashScreen().setProgression(40);
+
+ if (core.getSplashScreen() != null)
+ core.getSplashScreen().setProgression(40);
while(pluginIt.hasNext()) {
final String pluginName =
(String)pluginIt.next();
-
core.getSplashScreen().setProgressionAndStatus(core.getSplashScreen().getProgression()+progressJump,
-
"Loading plugin
'"+pluginName.replaceFirst("thaw.plugins.", "")+"' ...");
+ if (core.getSplashScreen() != null)
+
core.getSplashScreen().setProgressionAndStatus(core.getSplashScreen().getProgression()+progressJump,
+
"Loading plugin
'"+pluginName.replaceFirst("thaw.plugins.", "")+"' ...");
if (loadPlugin(pluginName) == null) {
Logger.notice(this, "Plugin alread
loaded");
@@ -198,10 +201,12 @@
javax.swing.ImageIcon icon;
- if ((icon = plugin.getIcon()) != null)
- core.getSplashScreen().addIcon(icon);
- else
-
core.getSplashScreen().addIcon(thaw.gui.IconBox.add);
+ if (core.getSplashScreen() != null) {
+ if ((icon = plugin.getIcon()) != null)
+
core.getSplashScreen().addIcon(icon);
+ else
+
core.getSplashScreen().addIcon(thaw.gui.IconBox.add);
+ }
plugin.run(core);
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java 2008-01-19 00:02:16 UTC
(rev 17161)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java 2008-01-19 00:13:49 UTC
(rev 17162)
@@ -365,6 +365,11 @@
return;
}
+
+ if ("PersistentGet".equals(message.getMessageName())) {
+ /* not our problem */
+ return;
+ }
if("ProtocolError".equals( message.getMessageName() )) {
Logger.debug(this, "ProtocolError !");
@@ -914,10 +919,10 @@
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;
+
+ queueManager.getQueryManager().deleteObserver(this);
boolean wasFinished = isFinished();
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java 2008-01-19 00:02:16 UTC
(rev 17161)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java 2008-01-19 00:13:49 UTC
(rev 17162)
@@ -600,6 +600,8 @@
if("PutSuccessful".equals(msg.getMessageName())) {
setStatus(false, true, true);
+
+
queueManager.getQueryManager().deleteObserver(this);
setStartupTime(Long.valueOf(msg.getValue("StartupTime")).longValue());
setCompletionTime(Long.valueOf(msg.getValue("CompletionTime")).longValue());
Modified: trunk/apps/Thaw/src/thaw/gui/GUIHelper.java
===================================================================
--- trunk/apps/Thaw/src/thaw/gui/GUIHelper.java 2008-01-19 00:02:16 UTC (rev
17161)
+++ trunk/apps/Thaw/src/thaw/gui/GUIHelper.java 2008-01-19 00:13:49 UTC (rev
17162)
@@ -15,6 +15,7 @@
import thaw.core.I18n;
public class GUIHelper {
+ private final static String unknownStr =
I18n.getMessage("thaw.common.unknown");
public GUIHelper() {
@@ -73,7 +74,7 @@
public static String getPrintableTime(final long seconds) {
if (seconds == 0)
- return I18n.getMessage("thaw.common.unknown");
+ return unknownStr;
if (seconds < 60)
return (new Long(seconds)).toString() + " s";
@@ -96,7 +97,7 @@
public static String getPrintableSize(final long size) {
if(size == 0)
- return I18n.getMessage("thaw.common.unknown");
+ return unknownStr;
if(size < 1024) /* < 1KB */
return ((new Long(size)).toString() + " B");
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKMessage.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKMessage.java
2008-01-19 00:02:16 UTC (rev 17161)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKMessage.java
2008-01-19 00:13:49 UTC (rev 17162)
@@ -136,7 +136,7 @@
if (!parser.loadFile(new File(get.getPath()), db)) {
/* invalid slot */
- Logger.notice(this, "Invalid message:
'"+board.getName()+"'"
+ Logger.notice(this, " message:
'"+board.getName()+"'"
+" - "+date.toString()
+" -
"+Integer.toString(rev));
