[Mspsim-commit] SF.net SVN: mspsim: [242] mspsim/se/sics/mspsim

[<ni...@us...>]

Revision: 242
          http://mspsim.svn.sourceforge.net/mspsim/?rev=242&view=rev
Author:   nifi
Date:     2008-04-16 09:42:52 -0700 (Wed, 16 Apr 2008)

Log Message:
-----------
added defaultValue to atoi() instead of throwing exception for non-number arguments

Modified Paths:
--------------
    mspsim/se/sics/mspsim/cli/AbstractWindowDataHandler.java
    mspsim/se/sics/mspsim/extutil/jfreechart/LineSampleChart.java

Modified: mspsim/se/sics/mspsim/cli/AbstractWindowDataHandler.java
===================================================================
--- mspsim/se/sics/mspsim/cli/AbstractWindowDataHandler.java	2008-04-16 13:42:34 UTC (rev 241)
+++ mspsim/se/sics/mspsim/cli/AbstractWindowDataHandler.java	2008-04-16 16:42:52 UTC (rev 242)
@@ -39,8 +39,6 @@
  */
 package se.sics.mspsim.cli;
 
-import javax.swing.JComponent;
-
 /**
  * @author joakime
  *
@@ -51,17 +49,23 @@
   public void handleCommand(String[] parts) {
     String cmd = parts[0];
     if ("set".equals(cmd)) {
-      int index = atoi(parts[1]);
+      int index = atoi(parts[1], 0);
       String[] args = new String[parts.length - 3];
       System.arraycopy(parts, 3, args, 0, args.length);
       setProperty(index, parts[2], args);
+    } else {
+      System.err.println("unknown command: " + cmd);
     }
   }
-    
+
   public abstract void setProperty(int index, String param, String[] args);
-  
-  public int atoi(String data) {
-    return Integer.parseInt(data);
+
+  public int atoi(String data, int defaultValue) {
+    try {
+      return Integer.parseInt(data);
+    } catch (NumberFormatException e) {
+      return defaultValue;
+    }
   }
-  
+
 }

Modified: mspsim/se/sics/mspsim/extutil/jfreechart/LineSampleChart.java
===================================================================
--- mspsim/se/sics/mspsim/extutil/jfreechart/LineSampleChart.java	2008-04-16 13:42:34 UTC (rev 241)
+++ mspsim/se/sics/mspsim/extutil/jfreechart/LineSampleChart.java	2008-04-16 16:42:52 UTC (rev 242)
@@ -63,7 +63,7 @@
     String parts[] = line.trim().split(" ");
     dataSeries.clear();
     for (int i = 0; i < parts.length; i++) {
-      dataSeries.add(i, atoi(parts[i]));
+      dataSeries.add(i, atoi(parts[i], 0));
     }
     panel.repaint();
   }


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