From 30e0584ec54772445b306cc298fa2ddb6f90e0d1 Mon Sep 17 00:00:00 2001
From: fros4943 <fros4943>
Date: Wed, 10 Jan 2007 08:48:13 +0000
Subject: [PATCH] fixes possible ambiguous compilation error by explicitly
 casting null

---
 .../java/se/sics/cooja/contikimote/ContikiMoteTypeDialog.java | 4 ++--
 .../java/se/sics/cooja/mantismote/MantisMoteTypeDialog.java   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/cooja/java/se/sics/cooja/contikimote/ContikiMoteTypeDialog.java b/tools/cooja/java/se/sics/cooja/contikimote/ContikiMoteTypeDialog.java
index e212cc3e0..e04be2b8f 100644
--- a/tools/cooja/java/se/sics/cooja/contikimote/ContikiMoteTypeDialog.java
+++ b/tools/cooja/java/se/sics/cooja/contikimote/ContikiMoteTypeDialog.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ContikiMoteTypeDialog.java,v 1.14 2007/01/09 10:07:44 fros4943 Exp $
+ * $Id: ContikiMoteTypeDialog.java,v 1.15 2007/01/10 08:48:13 fros4943 Exp $
  */
 
 package se.sics.cooja.contikimote;
@@ -887,7 +887,7 @@ public class ContikiMoteTypeDialog extends JDialog {
     libraryCreatedOK = false;
 
     JPanel progressPanel = new JPanel(new BorderLayout());
-    final JDialog progressDialog = new JDialog(myDialog, null);
+    final JDialog progressDialog = new JDialog(myDialog, (String) null);
     JProgressBar progressBar;
     JButton button;
     final MessageList taskOutput;
diff --git a/tools/cooja/java/se/sics/cooja/mantismote/MantisMoteTypeDialog.java b/tools/cooja/java/se/sics/cooja/mantismote/MantisMoteTypeDialog.java
index 06e4d665d..b814dc9f9 100644
--- a/tools/cooja/java/se/sics/cooja/mantismote/MantisMoteTypeDialog.java
+++ b/tools/cooja/java/se/sics/cooja/mantismote/MantisMoteTypeDialog.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MantisMoteTypeDialog.java,v 1.2 2007/01/09 10:02:16 fros4943 Exp $
+ * $Id: MantisMoteTypeDialog.java,v 1.3 2007/01/10 08:48:39 fros4943 Exp $
  */
 
 package se.sics.cooja.mantismote;
@@ -342,7 +342,7 @@ public class MantisMoteTypeDialog extends JDialog {
     libraryCreatedOK = false;
 
     JPanel progressPanel = new JPanel(new BorderLayout());
-    final JDialog progressDialog = new JDialog(myDialog, null);
+    final JDialog progressDialog = new JDialog(myDialog, (String) null);
     JProgressBar progressBar;
     JButton button;
     final MessageList taskOutput;