mspsim-commit

[Mspsim-commit] SF.net SVN: mspsim: [241] mspsim/se/sics/mspsim/cli/WindowTarget.java

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

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

Log Message:
-----------
changed to use command parser

Modified Paths:
--------------
    mspsim/se/sics/mspsim/cli/WindowTarget.java

Modified: mspsim/se/sics/mspsim/cli/WindowTarget.java
===================================================================
--- mspsim/se/sics/mspsim/cli/WindowTarget.java	2008-04-16 13:32:10 UTC (rev 240)
+++ mspsim/se/sics/mspsim/cli/WindowTarget.java	2008-04-16 13:42:34 UTC (rev 241)
@@ -12,7 +12,7 @@
   // Default in the current version - TODO: replace with better
   private JTextArea jta = new JTextArea(40,40);
   private WindowDataHandler dataHandler = null;
-  
+
   public WindowTarget(String name) {
     window = new JFrame(name);
     window.getContentPane().add(jta);
@@ -20,21 +20,19 @@
     window.setVisible(true);
     targetName = name;
   }
-  
+
   @Override
   public void lineRead(String line) {
-    // TODO Auto-generated method stub
     if (line != null && line.startsWith("#!")) {
       line = line.substring(2);
-      // TODO: replace with command parser
-      String[] parts = line.split(" ");
+      String[] parts = CommandParser.parseLine(line);
       String cmd = parts[0];
       if ("bounds".equals(cmd)) {
         try {
           window.setBounds(Integer.parseInt(parts[1]), Integer.parseInt(parts[2]),
               Integer.parseInt(parts[3]), Integer.parseInt(parts[4]));
         } catch (Exception e) {
-          System.err.println("Cound not set bounds: " + line);
+          System.err.println("Could not set bounds: " + line);
         }
       } else if ("title".equals(cmd)) {
         window.setTitle(parts[1]);
@@ -57,19 +55,17 @@
         jta.append(line + '\n');
       }
     }
-    //    jta.set
   }
 
   public void close() {
-    // Notify all the currently active "streams" of lines to this windows
-    // data-handlers
+    // TODO Notify all the currently active "streams" of lines to this windows data-handlers
     window.setVisible(false);
+    window.dispose();
     window.removeAll();
     window = null;
   }
 
   public String getName() {
-    // TODO Auto-generated method stub
     return targetName;
-  }  
+  }
 }


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

[Mspsim-commit] SF.net SVN: mspsim: [253] mspsim/se/sics/mspsim/cli/WindowTarget.java

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

Revision: 253
          http://mspsim.svn.sourceforge.net/mspsim/?rev=253&view=rev
Author:   nifi
Date:     2008-04-22 05:30:44 -0700 (Tue, 22 Apr 2008)

Log Message:
-----------
merge arguments to title

Modified Paths:
--------------
    mspsim/se/sics/mspsim/cli/WindowTarget.java

Modified: mspsim/se/sics/mspsim/cli/WindowTarget.java
===================================================================
--- mspsim/se/sics/mspsim/cli/WindowTarget.java	2008-04-22 12:29:41 UTC (rev 252)
+++ mspsim/se/sics/mspsim/cli/WindowTarget.java	2008-04-22 12:30:44 UTC (rev 253)
@@ -37,9 +37,10 @@
           System.err.println("Could not set bounds: " + line);
         }
       } else if ("title".equals(cmd)) {
-        window.setTitle(parts[1]);
+        String args = CommandParser.toString(parts, 1, parts.length);
+        window.setTitle(args);
         if (dataHandler != null) {
-          dataHandler.setProperty("title", new String[] {parts[1]});
+          dataHandler.setProperty("title", new String[] {args});
         }
       } else if ("type".equals(cmd)) {
         if ("line-sample".equals(parts[1])) {


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

[Mspsim-commit] SF.net SVN: mspsim: [254] mspsim/se/sics/mspsim/cli/WindowTarget.java

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

Revision: 254
          http://mspsim.svn.sourceforge.net/mspsim/?rev=254&view=rev
Author:   nifi
Date:     2008-04-22 05:43:55 -0700 (Tue, 22 Apr 2008)

Log Message:
-----------
fixed to set title in new data handler

Modified Paths:
--------------
    mspsim/se/sics/mspsim/cli/WindowTarget.java

Modified: mspsim/se/sics/mspsim/cli/WindowTarget.java
===================================================================
--- mspsim/se/sics/mspsim/cli/WindowTarget.java	2008-04-22 12:30:44 UTC (rev 253)
+++ mspsim/se/sics/mspsim/cli/WindowTarget.java	2008-04-22 12:43:55 UTC (rev 254)
@@ -47,11 +47,19 @@
           dataHandler = new LineSampleChart();
         } else if ("line".equals(parts[1])) {
           dataHandler = new LineChart();
+        } else {
+          System.err.println("Unknown window data handler type: " + parts[1]);
         }
         if (dataHandler != null) {
           System.out.println("Replacing window data handler! " + parts[1] + " " + dataHandler);
           window.getContentPane().removeAll();
           window.getContentPane().add(dataHandler.getComponent());
+          String title = window.getTitle();
+          if (title != null) {
+            // Set title for the new data handler
+            dataHandler.setProperty("title", new String[] { title });
+          }
+          window.repaint();
         }
       } else if (dataHandler != null) {
         dataHandler.handleCommand(parts);


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

[Mspsim-commit] SF.net SVN: mspsim: [256] mspsim/se/sics/mspsim/cli/WindowTarget.java

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

Revision: 256
          http://mspsim.svn.sourceforge.net/mspsim/?rev=256&view=rev
Author:   nifi
Date:     2008-04-22 11:57:49 -0700 (Tue, 22 Apr 2008)

Log Message:
-----------
use AWT thread to update Window targets

Modified Paths:
--------------
    mspsim/se/sics/mspsim/cli/WindowTarget.java

Modified: mspsim/se/sics/mspsim/cli/WindowTarget.java
===================================================================
--- mspsim/se/sics/mspsim/cli/WindowTarget.java	2008-04-22 18:55:59 UTC (rev 255)
+++ mspsim/se/sics/mspsim/cli/WindowTarget.java	2008-04-22 18:57:49 UTC (rev 256)
@@ -2,6 +2,7 @@
 
 import javax.swing.JFrame;
 import javax.swing.JTextArea;
+import javax.swing.SwingUtilities;
 
 import se.sics.mspsim.extutil.jfreechart.LineChart;
 import se.sics.mspsim.extutil.jfreechart.LineSampleChart;
@@ -23,8 +24,17 @@
   }
 
   @Override
-  public void lineRead(String line) {    
-    if (line == null) return;
+  public void lineRead(final String line) {    
+    if (line != null && window != null) {
+      SwingUtilities.invokeLater(new Runnable() {
+        public void run() {
+          handleLine(line);
+        }
+      });
+    }
+  }
+
+  private void handleLine(String line) {
     if (line.startsWith("#!")) {
       line = line.substring(2);
       String[] parts = CommandParser.parseLine(line);


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

[Mspsim-commit] SF.net SVN: mspsim: [276] mspsim/se/sics/mspsim/cli/WindowTarget.java

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

Revision: 276
          http://mspsim.svn.sourceforge.net/mspsim/?rev=276&view=rev
Author:   nifi
Date:     2008-05-12 09:29:30 -0700 (Mon, 12 May 2008)

Log Message:
-----------
added scrollpane around default text area

Modified Paths:
--------------
    mspsim/se/sics/mspsim/cli/WindowTarget.java

Modified: mspsim/se/sics/mspsim/cli/WindowTarget.java
===================================================================
--- mspsim/se/sics/mspsim/cli/WindowTarget.java	2008-05-10 21:25:50 UTC (rev 275)
+++ mspsim/se/sics/mspsim/cli/WindowTarget.java	2008-05-12 16:29:30 UTC (rev 276)
@@ -1,6 +1,7 @@
 package se.sics.mspsim.cli;
 
 import javax.swing.JFrame;
+import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
 import javax.swing.SwingUtilities;
 
@@ -17,7 +18,7 @@
 
   public WindowTarget(String name) {
     window = new JFrame(name);
-    window.getContentPane().add(jta);
+    window.getContentPane().add(new JScrollPane(jta, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER));
     window.pack();
     window.setVisible(true);
     targetName = name;


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

[Mspsim-commit] SF.net SVN: mspsim: [277] mspsim/se/sics/mspsim/cli/WindowTarget.java

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

Revision: 277
          http://mspsim.svn.sourceforge.net/mspsim/?rev=277&view=rev
Author:   nifi
Date:     2008-05-12 10:11:03 -0700 (Mon, 12 May 2008)

Log Message:
-----------
added commands to set font and clear default text area

Modified Paths:
--------------
    mspsim/se/sics/mspsim/cli/WindowTarget.java

Modified: mspsim/se/sics/mspsim/cli/WindowTarget.java
===================================================================
--- mspsim/se/sics/mspsim/cli/WindowTarget.java	2008-05-12 16:29:30 UTC (rev 276)
+++ mspsim/se/sics/mspsim/cli/WindowTarget.java	2008-05-12 17:11:03 UTC (rev 277)
@@ -1,5 +1,6 @@
 package se.sics.mspsim.cli;
 
+import java.awt.Font;
 import javax.swing.JFrame;
 import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
@@ -17,6 +18,8 @@
   private WindowDataHandler dataHandler = null;
 
   public WindowTarget(String name) {
+//    jta.setFont(Font.decode("Courier"));
+    jta.setEditable(false);
     window = new JFrame(name);
     window.getContentPane().add(new JScrollPane(jta, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER));
     window.pack();
@@ -74,6 +77,16 @@
         }
       } else if (dataHandler != null) {
         dataHandler.handleCommand(parts);
+      } else if ("clear".equals(cmd)) {
+        jta.setText("");
+      } else if ("tabsize".equals(cmd)) {
+        try {
+          jta.setTabSize(Integer.parseInt(parts[1]));
+        } catch (Exception e) {
+          System.err.println("Could not set tab size: " + line);
+        }
+      } else if ("font".equals(cmd)) {
+        jta.setFont(Font.decode(parts[1]));
       }
     } else if (!line.startsWith("#")){
       if (dataHandler != null) {


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

[Mspsim-commit] SF.net SVN: mspsim: [283] mspsim/se/sics/mspsim/cli/WindowTarget.java

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

Revision: 283
          http://mspsim.svn.sourceforge.net/mspsim/?rev=283&view=rev
Author:   nifi
Date:     2008-05-13 15:12:06 -0700 (Tue, 13 May 2008)

Log Message:
-----------
fixed size font as default

Modified Paths:
--------------
    mspsim/se/sics/mspsim/cli/WindowTarget.java

Modified: mspsim/se/sics/mspsim/cli/WindowTarget.java
===================================================================
--- mspsim/se/sics/mspsim/cli/WindowTarget.java	2008-05-13 15:21:57 UTC (rev 282)
+++ mspsim/se/sics/mspsim/cli/WindowTarget.java	2008-05-13 22:12:06 UTC (rev 283)
@@ -18,7 +18,7 @@
   private WindowDataHandler dataHandler = null;
 
   public WindowTarget(String name) {
-//    jta.setFont(Font.decode("Courier"));
+    jta.setFont(Font.decode("Courier"));
     jta.setEditable(false);
     window = new JFrame(name);
     window.getContentPane().add(new JScrollPane(jta, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER));


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

[Mspsim-commit] SF.net SVN: mspsim: [284] mspsim/se/sics/mspsim/cli/WindowTarget.java

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

Revision: 284
          http://mspsim.svn.sourceforge.net/mspsim/?rev=284&view=rev
Author:   nifi
Date:     2008-05-13 15:49:19 -0700 (Tue, 13 May 2008)

Log Message:
-----------
increased default window size

Modified Paths:
--------------
    mspsim/se/sics/mspsim/cli/WindowTarget.java

Modified: mspsim/se/sics/mspsim/cli/WindowTarget.java
===================================================================
--- mspsim/se/sics/mspsim/cli/WindowTarget.java	2008-05-13 22:12:06 UTC (rev 283)
+++ mspsim/se/sics/mspsim/cli/WindowTarget.java	2008-05-13 22:49:19 UTC (rev 284)
@@ -14,7 +14,7 @@
   private JFrame window;
   private String targetName;
   // Default in the current version - TODO: replace with better
-  private JTextArea jta = new JTextArea(40,40);
+  private JTextArea jta = new JTextArea(40,80);
   private WindowDataHandler dataHandler = null;
 
   public WindowTarget(String name) {
@@ -28,7 +28,7 @@
   }
 
   @Override
-  public void lineRead(final String line) {    
+  public void lineRead(final String line) {
     if (line != null && window != null) {
       SwingUtilities.invokeLater(new Runnable() {
         public void run() {


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