From 4653778e8cafe598b2404cb84f70c4266306bb41 Mon Sep 17 00:00:00 2001
From: Fredrik Osterlind <fros@sics.se>
Date: Thu, 26 Jan 2012 16:19:01 +0100
Subject: [PATCH] minor bug fix to avoid need for updating filesystem twice
 initially

---
 .../interfaces/SkyCoffeeFilesystem.java        | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkyCoffeeFilesystem.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkyCoffeeFilesystem.java
index 0c7e7275c..56a803843 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkyCoffeeFilesystem.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkyCoffeeFilesystem.java
@@ -108,26 +108,17 @@ public class SkyCoffeeFilesystem extends MoteInterface {
   }
 
   private void updateFS() {
-    if (SwingUtilities.isEventDispatchThread()) {
-      /* Don't call me in EDT */
-      new Thread(new Runnable() {
-        public void run() {
-          updateFS();
-        }
-      }).start();
-      return;
-    }
-
     /* Create new filesystem instance */
     try {
       SkyFlash flash = mote.getInterfaces().getInterfaceOfType(SkyFlash.class);
       coffeeFS = new CoffeeFS(flash.m24p80);
     } catch (IOException e) {
+      logger.fatal(e.getMessage(), e);
       coffeeFS = null;
     }
 
-    final CoffeeFile[] tmpFiles = coffeeFS.getFiles().values().toArray(new CoffeeFile[0]);
-    for (CoffeeFile file : tmpFiles) {
+    files = coffeeFS.getFiles().values().toArray(new CoffeeFile[0]);
+    for (CoffeeFile file : files) {
       file.getName();
       try {
         file.getLength();
@@ -137,8 +128,6 @@ public class SkyCoffeeFilesystem extends MoteInterface {
 
     EventQueue.invokeLater(new Runnable() {
       public void run() {
-        /* Update table */
-        files = tmpFiles;
         ((AbstractTableModel)filesTable.getModel()).fireTableDataChanged();
       }
     });
@@ -323,6 +312,7 @@ public class SkyCoffeeFilesystem extends MoteInterface {
   
   public boolean insertFile(String diskFilename) {
     try {
+      updateFS();
       return coffeeFS.insertFile(diskFilename) != null;
     } catch (RuntimeException e) {
       logger.fatal("Error: " + e.getMessage(), e);