Author: jflesch
Date: 2007-08-05 20:04:08 +0000 (Sun, 05 Aug 2007)
New Revision: 14489
Modified:
trunk/apps/Thaw/src/thaw/core/ConfigWindow.java
trunk/apps/Thaw/src/thaw/core/Main.java
trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java
trunk/apps/Thaw/src/thaw/fcp/FCPQueryManager.java
trunk/apps/Thaw/src/thaw/gui/IconBox.java
trunk/apps/Thaw/src/thaw/plugins/miniFrost/DraftPanel.java
trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessagePanel.java
trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessageTreeTable.java
trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKMessage.java
Log:
Change the build process (will require an update of the build.xml) + Fix
miniFrost on Windows
Modified: trunk/apps/Thaw/src/thaw/core/ConfigWindow.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/ConfigWindow.java 2007-08-05 19:30:25 UTC
(rev 14488)
+++ trunk/apps/Thaw/src/thaw/core/ConfigWindow.java 2007-08-05 20:04:08 UTC
(rev 14489)
@@ -232,7 +232,8 @@
"
"+I18n.getMessage("thaw.common.pleaseWait"));
dialog.getContentPane().setLayout(new GridLayout(1, 1));
- dialog.getContentPane().add(new
JLabel(I18n.getMessage("thaw.common.pleaseWait")));
+ dialog.getContentPane().add(new
JLabel(I18n.getMessage("thaw.common.pleaseWait"),
+ JLabel.CENTER));
dialog.setUndecorated(true);
dialog.setResizable(false);
Modified: trunk/apps/Thaw/src/thaw/core/Main.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/Main.java 2007-08-05 19:30:25 UTC (rev
14488)
+++ trunk/apps/Thaw/src/thaw/core/Main.java 2007-08-05 20:04:08 UTC (rev
14489)
@@ -8,6 +8,17 @@
import java.util.Vector;
import java.util.Iterator;
+import java.util.zip.ZipFile;
+import java.util.zip.ZipEntry;
+import java.io.File;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.FileOutputStream;
+
+
+
/**
* Main class. Only used to display some informations and init the core.
*
@@ -38,6 +49,11 @@
private static String locale = null;
+ private Main() {
+
+ }
+
+
/**
* Used to start the program
*
@@ -46,6 +62,8 @@
public static void main(final String[] args) {
Core core;
+ Main.extractDeps();
+
Main.parseCommandLine(args);
if(Main.locale != null)
@@ -128,5 +146,64 @@
}
+ /**
+ * need a non-static context
+ */
+ public void extractFileFromJar(String src, String dst) {
+ try {
+ String realHome = this.getClass().getProtectionDomain().
+ getCodeSource().getLocation().toString();
+ String home = realHome.substring(5);
+
+ Logger.info(this, "Extracting : "+realHome+" ; "+src+"
; "+dst);
+
+ ZipFile jar = new ZipFile(home);
+ ZipEntry entry = jar.getEntry(src);
+
+ File jarFile = new File(dst);
+
+
+ InputStream in = new
BufferedInputStream(jar.getInputStream(entry));
+ OutputStream out = new BufferedOutputStream(new
FileOutputStream(jarFile));
+
+ byte[] buffer = new byte[2048];
+
+ int nBytes;
+
+ while( (nBytes = in.read(buffer)) > 0) {
+ out.write(buffer, 0, nBytes);
+ }
+
+ out.flush();
+ out.close();
+ in.close();
+
+ return;
+ } catch(java.io.IOException e) {
+ Logger.error(this, "Can't extract '"+src+"' because :
"+e.toString());
+ if (e.getCause() != null)
+ Logger.error(this, "Cause :
"+e.getCause().toString());
+ e.printStackTrace();
+ }
+
+ System.exit(1);
+ }
+
+
+ public final static String[] DEPS = new String[] {
+ "jmdns.jar",
+ "hsqldb.jar",
+ "BouncyCastle.jar"
+ };
+
+ public static void extractDeps() {
+ Main main = new Main();
+
+ /* we erase each time the files to be sure that they are always
up to date */
+ for (int i = 0 ; i < DEPS.length ; i++) {
+ main.extractFileFromJar("lib/"+DEPS[i], DEPS[i]);
+ }
+ }
+
}
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java 2007-08-05 19:30:25 UTC
(rev 14488)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java 2007-08-05 20:04:08 UTC
(rev 14489)
@@ -995,17 +995,21 @@
}
public String getPath() {
+ String path = null;
+
if (finalPath != null)
- return finalPath;
+ path = finalPath;
+ else if(destinationDir != null)
+ path = destinationDir + File.separator + filename;
- if(destinationDir != null)
- return destinationDir + File.separator + filename;
+ if (path != null)
+ path = path.replaceAll("\\|", "-");
- return null;
+ return path;
}
public String getFilename() {
- return filename;
+ return filename.replaceAll("\\|", "-");
}
public int getAttempt() {
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPQueryManager.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPQueryManager.java 2007-08-05 19:30:25 UTC
(rev 14488)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPQueryManager.java 2007-08-05 20:04:08 UTC
(rev 14489)
@@ -115,7 +115,7 @@
public class WatchDog implements Runnable {
- public final static int TIMEOUT = 5000;
+ public final static int TIMEOUT = 10000;
Runnable runnable;
Modified: trunk/apps/Thaw/src/thaw/gui/IconBox.java
===================================================================
--- trunk/apps/Thaw/src/thaw/gui/IconBox.java 2007-08-05 19:30:25 UTC (rev
14488)
+++ trunk/apps/Thaw/src/thaw/gui/IconBox.java 2007-08-05 20:04:08 UTC (rev
14489)
@@ -204,105 +204,105 @@
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.minStop = IconBox.loadIcon("min-stop.png");
- IconBox.stop = IconBox.loadIcon("stop.png");
- IconBox.minDisconnectAction =
IconBox.loadIcon("min-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.minIndexNew =
IconBox.loadIcon("min-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.minAdd = IconBox.loadIcon("min-add.png");
- IconBox.insertAndAddToIndexAction =
IconBox.loadIcon("index.png");
- IconBox.makeALinkAction = IconBox.loadIcon("makeLink.png");
- IconBox.minMakeALinkAction =
IconBox.loadIcon("min-makeLink.png");
- IconBox.reconnectAction = IconBox.loadIcon("refresh.png");
- IconBox.minReconnectAction =
IconBox.loadIcon("min-refresh.png");
- IconBox.refreshAction = IconBox.loadIcon("refresh.png");
- IconBox.minRefreshAction =
IconBox.loadIcon("min-refresh.png");
- IconBox.quitAction = IconBox.loadIcon("quit.png");
- IconBox.minQuitAction = IconBox.loadIcon("min-quit.png");
- IconBox.key = IconBox.loadIcon("key.png");
- IconBox.minKey = IconBox.loadIcon("min-key.png");
- IconBox.delete = IconBox.loadIcon("delete.png");
- IconBox.minDelete =
IconBox.loadIcon("min-delete.png");
- IconBox.folderNew =
IconBox.loadIcon("folder-new.png");
- IconBox.minFolderNew =
IconBox.loadIcon("min-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.minRemove =
IconBox.loadIcon("min-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.computer = IconBox.loadIcon("computer.png");
- IconBox.identity = IconBox.loadIcon("identity.png");
- IconBox.peers = IconBox.loadIcon("peers.png");
- IconBox.minPeers = IconBox.loadIcon("min-peers.png");
- IconBox.lookAndFeel =
IconBox.loadIcon("lookAndFeel.png");
- IconBox.minLookAndFeel =
IconBox.loadIcon("min-lookAndFeel.png");
- IconBox.close =
IconBox.loadIcon("emblem-unreadable.png");
- IconBox.minClose =
IconBox.loadIcon("min-emblem-unreadable.png");
- IconBox.copy = IconBox.loadIcon("copy.png");
- IconBox.minCopy = IconBox.loadIcon("min-copy.png");
- IconBox.file = IconBox.loadIcon("file.png");
- IconBox.minFile = IconBox.loadIcon("min-file.png");
- IconBox.link =
IconBox.loadIcon("indexBrowser.png");
- IconBox.minLink =
IconBox.loadIcon("min-indexBrowser.png");
- IconBox.minIndexSettings =
IconBox.loadIcon("min-indexSettings.png");
- IconBox.indexSettings =
IconBox.loadIcon("indexSettings.png");
- IconBox.addComment =
IconBox.loadIcon("mail-message-new.png");
- IconBox.minAddComment =
IconBox.loadIcon("min-mail-message-new.png");
- IconBox.readComments =
IconBox.loadIcon("readComments.png");
- IconBox.minReadComments =
IconBox.loadIcon("min-readComments.png");
- IconBox.minRed = IconBox.loadIcon("min-red.png");
- IconBox.minOrange =
IconBox.loadIcon("min-orange.png");
- IconBox.minGreen = IconBox.loadIcon("min-green.png");
- IconBox.minDetails =
IconBox.loadIcon("min-details.png");
- IconBox.mDns = IconBox.loadIcon("mDns.png");
- IconBox.minMDns = IconBox.loadIcon("min-mDns.png");
- IconBox.msgReply =
IconBox.loadIcon("mail-reply-sender.png");
- IconBox.msgNew =
IconBox.loadIcon("mail-message-new.png");
- IconBox.minMsgReply =
IconBox.loadIcon("min-mail-reply-sender.png");
- IconBox.minMsgNew =
IconBox.loadIcon("min-mail-message-new.png");
- IconBox.search = IconBox.loadIcon("mDns.png");
- IconBox.minSearch = IconBox.loadIcon("min-mDns.png");
- IconBox.nextUnread =
IconBox.loadIcon("mail-forward.png");
- IconBox.minNextUnread =
IconBox.loadIcon("min-mail-forward.png");
- IconBox.up = IconBox.loadIcon("go-up.png");
- IconBox.down = IconBox.loadIcon("go-down.png");
- IconBox.left =
IconBox.loadIcon("go-previous.png");
- IconBox.right = IconBox.loadIcon("go-next.png");
- IconBox.minUp = IconBox.loadIcon("min-go-up.png");
- IconBox.minDown =
IconBox.loadIcon("min-go-down.png");
- IconBox.minLeft =
IconBox.loadIcon("min-go-previous.png");
- IconBox.minRight =
IconBox.loadIcon("min-go-next.png");
- IconBox.attachment =
IconBox.loadIcon("mail-attachment.png");
- IconBox.minAttachment =
IconBox.loadIcon("min-mail-attachment.png");
- IconBox.windowNew =
IconBox.loadIcon("window-new.png");
- IconBox.minWindowNew =
IconBox.loadIcon("min-window-new.png");
+ IconBox.blueBunny =
IconBox.loadIcon("images/blueBunny.png");
+ IconBox.connectAction =
IconBox.loadIcon("images/connect.png");
+ IconBox.minConnectAction =
IconBox.loadIcon("images/min-connect.png");
+ IconBox.disconnectAction =
IconBox.loadIcon("images/disconnect.png");
+ IconBox.minStop =
IconBox.loadIcon("images/min-stop.png");
+ IconBox.stop =
IconBox.loadIcon("images/stop.png");
+ IconBox.minDisconnectAction =
IconBox.loadIcon("images/min-disconnect.png");
+ IconBox.queue =
IconBox.loadIcon("images/connect.png");
+ IconBox.minQueue =
IconBox.loadIcon("images/min-connect.png");
+ IconBox.insertions =
IconBox.loadIcon("images/insertion.png");
+ IconBox.minInsertions =
IconBox.loadIcon("images/min-insertion.png");
+ IconBox.minIndex =
IconBox.loadIcon("images/min-index.png");
+ IconBox.minIndexReadOnly =
IconBox.loadIcon("images/min-indexReadOnly.png");
+ IconBox.indexNew =
IconBox.loadIcon("images/index-new.png");
+ IconBox.minIndexNew =
IconBox.loadIcon("images/min-index-new.png");
+ IconBox.indexReuse =
IconBox.loadIcon("images/indexReadOnly.png");
+ IconBox.downloads =
IconBox.loadIcon("images/download.png");
+ IconBox.minDownloads =
IconBox.loadIcon("images/min-download.png");
+ IconBox.settings =
IconBox.loadIcon("images/settings.png");
+ IconBox.minSettings =
IconBox.loadIcon("images/min-settings.png");
+ IconBox.indexBrowser =
IconBox.loadIcon("images/index.png");
+ IconBox.minIndexBrowser =
IconBox.loadIcon("images/min-index.png");
+ IconBox.addToIndexAction =
IconBox.loadIcon("images/add.png");
+ IconBox.add =
IconBox.loadIcon("images/add.png");
+ IconBox.minAdd =
IconBox.loadIcon("images/min-add.png");
+ IconBox.insertAndAddToIndexAction =
IconBox.loadIcon("images/index.png");
+ IconBox.makeALinkAction =
IconBox.loadIcon("images/makeLink.png");
+ IconBox.minMakeALinkAction =
IconBox.loadIcon("images/min-makeLink.png");
+ IconBox.reconnectAction =
IconBox.loadIcon("images/refresh.png");
+ IconBox.minReconnectAction =
IconBox.loadIcon("images/min-refresh.png");
+ IconBox.refreshAction =
IconBox.loadIcon("images/refresh.png");
+ IconBox.minRefreshAction =
IconBox.loadIcon("images/min-refresh.png");
+ IconBox.quitAction =
IconBox.loadIcon("images/quit.png");
+ IconBox.minQuitAction =
IconBox.loadIcon("images/min-quit.png");
+ IconBox.key =
IconBox.loadIcon("images/key.png");
+ IconBox.minKey =
IconBox.loadIcon("images/min-key.png");
+ IconBox.delete =
IconBox.loadIcon("images/delete.png");
+ IconBox.minDelete =
IconBox.loadIcon("images/min-delete.png");
+ IconBox.folderNew =
IconBox.loadIcon("images/folder-new.png");
+ IconBox.minFolderNew =
IconBox.loadIcon("images/min-folder-new.png");
+ IconBox.help =
IconBox.loadIcon("images/help.png");
+ IconBox.minHelp =
IconBox.loadIcon("images/min-help.png");
+ IconBox.mainWindow =
IconBox.loadIcon("images/mainWindow.png");
+ IconBox.terminal =
IconBox.loadIcon("images/terminal.png");
+ IconBox.minTerminal =
IconBox.loadIcon("images/min-terminal.png");
+ IconBox.remove =
IconBox.loadIcon("images/remove.png");
+ IconBox.minRemove =
IconBox.loadIcon("images/min-remove.png");
+ IconBox.queueWatcher =
IconBox.loadIcon("images/queueWatcher.png");
+ IconBox.importExport =
IconBox.loadIcon("images/refresh.png");
+ IconBox.minImportAction =
IconBox.loadIcon("images/min-import.png");
+ IconBox.minExportAction =
IconBox.loadIcon("images/min-export.png");
+ IconBox.database =
IconBox.loadIcon("images/database.png");
+ IconBox.minPeerMonitor =
IconBox.loadIcon("images/min-peerMonitor.png");
+ IconBox.computer =
IconBox.loadIcon("images/computer.png");
+ IconBox.identity =
IconBox.loadIcon("images/identity.png");
+ IconBox.peers =
IconBox.loadIcon("images/peers.png");
+ IconBox.minPeers =
IconBox.loadIcon("images/min-peers.png");
+ IconBox.lookAndFeel =
IconBox.loadIcon("images/lookAndFeel.png");
+ IconBox.minLookAndFeel =
IconBox.loadIcon("images/min-lookAndFeel.png");
+ IconBox.close =
IconBox.loadIcon("images/emblem-unreadable.png");
+ IconBox.minClose =
IconBox.loadIcon("images/min-emblem-unreadable.png");
+ IconBox.copy =
IconBox.loadIcon("images/copy.png");
+ IconBox.minCopy =
IconBox.loadIcon("images/min-copy.png");
+ IconBox.file =
IconBox.loadIcon("images/file.png");
+ IconBox.minFile =
IconBox.loadIcon("images/min-file.png");
+ IconBox.link =
IconBox.loadIcon("images/indexBrowser.png");
+ IconBox.minLink =
IconBox.loadIcon("images/min-indexBrowser.png");
+ IconBox.minIndexSettings =
IconBox.loadIcon("images/min-indexSettings.png");
+ IconBox.indexSettings =
IconBox.loadIcon("images/indexSettings.png");
+ IconBox.addComment =
IconBox.loadIcon("images/mail-message-new.png");
+ IconBox.minAddComment =
IconBox.loadIcon("images/min-mail-message-new.png");
+ IconBox.readComments =
IconBox.loadIcon("images/readComments.png");
+ IconBox.minReadComments =
IconBox.loadIcon("images/min-readComments.png");
+ IconBox.minRed =
IconBox.loadIcon("images/min-red.png");
+ IconBox.minOrange =
IconBox.loadIcon("images/min-orange.png");
+ IconBox.minGreen =
IconBox.loadIcon("images/min-green.png");
+ IconBox.minDetails =
IconBox.loadIcon("images/min-details.png");
+ IconBox.mDns =
IconBox.loadIcon("images/mDns.png");
+ IconBox.minMDns =
IconBox.loadIcon("images/min-mDns.png");
+ IconBox.msgReply =
IconBox.loadIcon("images/mail-reply-sender.png");
+ IconBox.msgNew =
IconBox.loadIcon("images/mail-message-new.png");
+ IconBox.minMsgReply =
IconBox.loadIcon("images/min-mail-reply-sender.png");
+ IconBox.minMsgNew =
IconBox.loadIcon("images/min-mail-message-new.png");
+ IconBox.search =
IconBox.loadIcon("images/mDns.png");
+ IconBox.minSearch =
IconBox.loadIcon("images/min-mDns.png");
+ IconBox.nextUnread =
IconBox.loadIcon("images/mail-forward.png");
+ IconBox.minNextUnread =
IconBox.loadIcon("images/min-mail-forward.png");
+ IconBox.up =
IconBox.loadIcon("images/go-up.png");
+ IconBox.down =
IconBox.loadIcon("images/go-down.png");
+ IconBox.left =
IconBox.loadIcon("images/go-previous.png");
+ IconBox.right =
IconBox.loadIcon("images/go-next.png");
+ IconBox.minUp =
IconBox.loadIcon("images/min-go-up.png");
+ IconBox.minDown =
IconBox.loadIcon("images/min-go-down.png");
+ IconBox.minLeft =
IconBox.loadIcon("images/min-go-previous.png");
+ IconBox.minRight =
IconBox.loadIcon("images/min-go-next.png");
+ IconBox.attachment =
IconBox.loadIcon("images/mail-attachment.png");
+ IconBox.minAttachment =
IconBox.loadIcon("images/min-mail-attachment.png");
+ IconBox.windowNew =
IconBox.loadIcon("images/window-new.png");
+ IconBox.minWindowNew =
IconBox.loadIcon("images/min-window-new.png");
}
}
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/DraftPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/DraftPanel.java 2007-08-05
19:30:25 UTC (rev 14488)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/DraftPanel.java 2007-08-05
20:04:08 UTC (rev 14489)
@@ -101,8 +101,8 @@
cancelButton.addActionListener(this);
sendButton.addActionListener(this);
+ southPanel.add(sendButton);
southPanel.add(cancelButton);
- southPanel.add(sendButton);
panel.add(northPanel, BorderLayout.NORTH );
panel.add(new JScrollPane(textArea), BorderLayout.CENTER);
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessagePanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessagePanel.java
2007-08-05 19:30:25 UTC (rev 14488)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessagePanel.java
2007-08-05 20:04:08 UTC (rev 14489)
@@ -41,9 +41,9 @@
public final static String[] ACTIONS = {
"",
+ I18n.getMessage("thaw.plugin.miniFrost.reply"),
I18n.getMessage("thaw.plugin.miniFrost.archivate"),
I18n.getMessage("thaw.plugin.miniFrost.unarchivate"),
- I18n.getMessage("thaw.plugin.miniFrost.reply"),
I18n.getMessage("thaw.plugin.miniFrost.unfoldAll"),
I18n.getMessage("thaw.plugin.miniFrost.foldAll")
};
@@ -504,8 +504,8 @@
int sel = actions.getSelectedIndex();
- if (sel == 1 || sel == 2) { /* (un)archive */
- boolean archive = (sel == 1);
+ if (sel == 2 || sel == 3) { /* (un)archive */
+ boolean archive = (sel == 2);
msg.setArchived(archive);
mainPanel.getMessageTreeTable().refresh();
@@ -513,7 +513,7 @@
if (archive && !nextUnread())
mainPanel.displayMessageTable();
- } else if (sel == 3) { /* reply */
+ } else if (sel == 1) { /* reply */
Draft draft = msg.getBoard().getDraft(msg);
mainPanel.getDraftPanel().setDraft(draft);
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessageTreeTable.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessageTreeTable.java
2007-08-05 19:30:25 UTC (rev 14488)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessageTreeTable.java
2007-08-05 20:04:08 UTC (rev 14489)
@@ -97,9 +97,9 @@
I18n.getMessage("thaw.plugin.miniFrost.selectNone"),
I18n.getMessage("thaw.plugin.miniFrost.markAsRead"),
I18n.getMessage("thaw.plugin.miniFrost.markAsNonRead"),
+ I18n.getMessage("thaw.plugin.miniFrost.newMessage"),
I18n.getMessage("thaw.plugin.miniFrost.archivate"),
- I18n.getMessage("thaw.plugin.miniFrost.unarchivate"),
- I18n.getMessage("thaw.plugin.miniFrost.newMessage")
+ I18n.getMessage("thaw.plugin.miniFrost.unarchivate")
};
@@ -1055,8 +1055,8 @@
}
mainPanel.getBoardTree().refresh(targetBoard);
- } else if (sel == 5 || sel == 6) { /* (un)archive */
- boolean archive = (sel == 5);
+ } else if (sel == 6 || sel == 7) { /* (un)archive */
+ boolean archive = (sel == 6);
for (int i = 0 ; i < selected.length ; i++) {
if (selected[i])
@@ -1069,10 +1069,12 @@
boolean select = (sel == 1);
model.setSelectedAll(select);
model.refresh();
- } else if (sel == 7) { /* new message */
- Draft draft = targetBoard.getDraft(null);
- mainPanel.getDraftPanel().setDraft(draft);
- mainPanel.displayDraftPanel();
+ } else if (sel == 5) { /* new message */
+ if (targetBoard != null) {
+ Draft draft =
targetBoard.getDraft(null);
+
mainPanel.getDraftPanel().setDraft(draft);
+ mainPanel.displayDraftPanel();
+ }
}
actions.setSelectedIndex(0);
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKMessage.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKMessage.java
2007-08-05 19:30:25 UTC (rev 14488)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKMessage.java
2007-08-05 20:04:08 UTC (rev 14489)
@@ -106,7 +106,7 @@
Logger.info(this, key+" not found");
successfullyDownloaded = false;
} else {
- Logger.notice(this, "Problem with "+key);
+ Logger.notice(this, "Problem with "+key + " ;
code : "+Integer.toString(code));
successfullyDownloaded = true;
}
