[Columba-cvs] SF.net SVN: columba: [95] columba/trunk/mail/src/main/java/org/columba/mail

[<fd...@us...>]

Revision: 95
          http://svn.sourceforge.net/columba/?rev=95&view=rev
Author:   fdietz
Date:     2006-09-27 11:50:39 -0700 (Wed, 27 Sep 2006)

Log Message:
-----------
[bug]fix open message with URL

Modified Paths:
--------------
    columba/trunk/mail/src/main/java/org/columba/mail/facade/DialogFacade.java
    columba/trunk/mail/src/main/java/org/columba/mail/gui/message/command/ViewMessageCommand.java
    columba/trunk/mail/src/main/java/org/columba/mail/gui/tree/FolderTreeModel.java

Modified: columba/trunk/mail/src/main/java/org/columba/mail/facade/DialogFacade.java
===================================================================
--- columba/trunk/mail/src/main/java/org/columba/mail/facade/DialogFacade.java	2006-09-27 18:44:46 UTC (rev 94)
+++ columba/trunk/mail/src/main/java/org/columba/mail/facade/DialogFacade.java	2006-09-27 18:50:39 UTC (rev 95)
@@ -70,7 +70,7 @@
 		IMailbox folder = (IMailbox) FolderTreeModel.getInstance().getFolder(
 				folderId);
 		IMailFolderCommandReference r = new MailFolderCommandReference(folder,
-				new Object[] { messageId });
+				new Object[] { Integer.parseInt(messageId) });
 
 		c.setTreeSelection(r);
 

Modified: columba/trunk/mail/src/main/java/org/columba/mail/gui/message/command/ViewMessageCommand.java
===================================================================
--- columba/trunk/mail/src/main/java/org/columba/mail/gui/message/command/ViewMessageCommand.java	2006-09-27 18:44:46 UTC (rev 94)
+++ columba/trunk/mail/src/main/java/org/columba/mail/gui/message/command/ViewMessageCommand.java	2006-09-27 18:50:39 UTC (rev 95)
@@ -118,6 +118,8 @@
 	}
 
 	private void fillContext() {
+		if ( value == null) return;
+		
 		// create identity value
 		IStructureValue identity = value.addChild(
 				ISemanticContext.CONTEXT_NODE_IDENTITY,

Modified: columba/trunk/mail/src/main/java/org/columba/mail/gui/tree/FolderTreeModel.java
===================================================================
--- columba/trunk/mail/src/main/java/org/columba/mail/gui/tree/FolderTreeModel.java	2006-09-27 18:44:46 UTC (rev 94)
+++ columba/trunk/mail/src/main/java/org/columba/mail/gui/tree/FolderTreeModel.java	2006-09-27 18:50:39 UTC (rev 95)
@@ -17,7 +17,9 @@
 package org.columba.mail.gui.tree;
 
 import java.util.Enumeration;
+import java.util.Map;
 import java.util.MissingResourceException;
+import java.util.WeakHashMap;
 
 import javax.swing.tree.DefaultTreeModel;
 
@@ -55,6 +57,8 @@
 
 	protected TempFolder tempFolder;
 
+	private Map<String, IMailFolder> temporaryFolders = new WeakHashMap<String,IMailFolder>();
+	
 	private static FolderTreeModel instance = new FolderTreeModel(MailConfig
 			.getInstance().getFolderConfig());
 
@@ -101,6 +105,11 @@
 		return instance;
 	}
 
+	
+	public void addTemporaryFolder(IMailFolder folder) {
+		temporaryFolders.put(folder.getId(), folder);
+	}
+	
 	public void createDirectories(XmlElement parentTreeNode,
 			IMailFolder parentFolder) {
 		int count = parentTreeNode.count();
@@ -204,6 +213,9 @@
 			}
 		}
 
+		if ( temporaryFolders.containsKey(folderId))
+			return temporaryFolders.get(folderId);
+		
 		return null;
 	}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.