[Columba-svn] SF.net SVN: columba:[460] columba/trunk

[<es...@us...>]

Revision: 460
          http://columba.svn.sourceforge.net/columba/?rev=460&view=rev
Author:   eschman
Date:     2012-05-30 16:27:12 +0000 (Wed, 30 May 2012)
Log Message:
-----------
[bug]fix compile error under OpenJDK7 (the function was added to a parent class but with different return type
catch error which is thrown by the cobra renderer under OpenJDK7

Modified Paths:
--------------
    columba/trunk/mail/src/main/java/org/columba/mail/gui/tree/action/CreateSubFolderAction.java
    columba/trunk/mail/src/main/java/org/columba/mail/gui/tree/util/CreateFolderDialog.java
    columba/trunk/plugins/org.columba.core.CobraRenderer/src/org/columba/core/htmlviewer/CobraViewerPlugin.java

Modified: columba/trunk/mail/src/main/java/org/columba/mail/gui/tree/action/CreateSubFolderAction.java
===================================================================
--- columba/trunk/mail/src/main/java/org/columba/mail/gui/tree/action/CreateSubFolderAction.java	2011-09-26 22:44:56 UTC (rev 459)
+++ columba/trunk/mail/src/main/java/org/columba/mail/gui/tree/action/CreateSubFolderAction.java	2012-05-30 16:27:12 UTC (rev 460)
@@ -83,7 +83,7 @@
 			// ok pressed
 			selection.setSourceFolder(dialog.getSelected());
 			selection.setFolderName(dialog.getName());
-			selection.setFolderType(dialog.getType());
+			selection.setFolderType(dialog.getFolderType());
 
 			CommandProcessor.getInstance().addOp(
 					new CreateSubFolderCommand(selection));

Modified: columba/trunk/mail/src/main/java/org/columba/mail/gui/tree/util/CreateFolderDialog.java
===================================================================
--- columba/trunk/mail/src/main/java/org/columba/mail/gui/tree/util/CreateFolderDialog.java	2011-09-26 22:44:56 UTC (rev 459)
+++ columba/trunk/mail/src/main/java/org/columba/mail/gui/tree/util/CreateFolderDialog.java	2012-05-30 16:27:12 UTC (rev 460)
@@ -291,7 +291,7 @@
 	/**
 	 * @return
 	 */
-	public String getType() {
+	public String getFolderType() {
 		return (String) typeBox.getSelectedItem();
 	}
 }
\ No newline at end of file

Modified: columba/trunk/plugins/org.columba.core.CobraRenderer/src/org/columba/core/htmlviewer/CobraViewerPlugin.java
===================================================================
--- columba/trunk/plugins/org.columba.core.CobraRenderer/src/org/columba/core/htmlviewer/CobraViewerPlugin.java	2011-09-26 22:44:56 UTC (rev 459)
+++ columba/trunk/plugins/org.columba.core.CobraRenderer/src/org/columba/core/htmlviewer/CobraViewerPlugin.java	2012-05-30 16:27:12 UTC (rev 460)
@@ -10,6 +10,7 @@
 import javax.swing.JPanel;
 
 import org.columba.core.desktop.ColumbaDesktop;
+import org.columba.core.gui.dialog.ErrorDialog;
 import org.columba.core.gui.htmlviewer.api.IHTMLViewerPlugin;
 import org.lobobrowser.html.HtmlRendererContext;
 import org.lobobrowser.html.gui.HtmlPanel;
@@ -47,7 +48,9 @@
 
 			htmlPanel.setDocument(document, rendererContext);
 		} catch (Exception e) {
-			e.printStackTrace();
+			ErrorDialog.createDialog(e.getMessage(), e);
+		} catch (Error e) {
+			ErrorDialog.createDialog(e.getMessage(), e);
 		}
 	}
 

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