added some minor formating things to test checkstyle reporting in cruisecontrol....

[tinyos-2.x.git] / apps / MultihopOscilloscope / java / Oscilloscope.java

diff --git a/apps/MultihopOscilloscope/java/Oscilloscope.java b/apps/MultihopOscilloscope/java/Oscilloscope.java
index 3db3741f944032bc38d3c1a2ccdee1faac51a52c..fc898a92c285a753bf30374913295518b5c4872e 100644 (file)
--- a/apps/MultihopOscilloscope/java/Oscilloscope.java
+++ b/apps/MultihopOscilloscope/java/Oscilloscope.java
@@ -49,80 +49,80 @@ public class Oscilloscope implements MessageListener
 
     /* Main entry point */
     void run() {
-       data = new Data(this);
-       window = new Window(this);
-       window.setup();
-       mote = new MoteIF(PrintStreamMessenger.err);
-       mote.registerListener(new OscilloscopeMsg(), this);
+    data = new Data(this);
+    window = new Window(this);
+    window.setup();
+    mote = new MoteIF(PrintStreamMessenger.err);
+    mote.registerListener(new OscilloscopeMsg(), this);
     }
 
     /* The data object has informed us that nodeId is a previously unknown
        mote. Update the GUI. */
     void newNode(int nodeId) {
-       window.newNode(nodeId);
+    window.newNode(nodeId);
     }
 
     synchronized public void messageReceived(int dest_addr, Message msg) {
-       if (msg instanceof OscilloscopeMsg) {
-           OscilloscopeMsg omsg = (OscilloscopeMsg)msg;
+    if (msg instanceof OscilloscopeMsg) {
+        OscilloscopeMsg omsg = (OscilloscopeMsg)msg;
 
-           /* Update interval and mote data */
-           periodUpdate(omsg.get_version(), omsg.get_interval());
-           data.update(omsg.get_id(), omsg.get_count(), omsg.get_readings());
+        /* Update interval and mote data */
+        periodUpdate(omsg.get_version(), omsg.get_interval());
+        data.update(omsg.get_id(), omsg.get_count(), omsg.get_readings());
 
-           /* Inform the GUI that new data showed up */
-           window.newData();
-       }
+        /* Inform the GUI that new data showed up */
+        window.newData();
+    }
     }
 
     /* A potentially new version and interval has been received from the
        mote */
     void periodUpdate(int moteVersion, int moteInterval) {
-       if (moteVersion > version) {
-           /* It's new. Update our vision of the interval. */
-           version = moteVersion;
-           interval = moteInterval;
-           window.updateSamplePeriod();
-       }
-       else if (moteVersion < version) {
-           /* It's old. Update the mote's vision of the interval. */
-           sendInterval();
-       }
+    if (moteVersion > version) {
+        /* It's new. Update our vision of the interval. */
+        version = moteVersion;
+        interval = moteInterval;
+        window.updateSamplePeriod();
+    }
+    else if (moteVersion < version) {
+        /* It's old. Update the mote's vision of the interval. */
+        sendInterval();
+    }
     }
 
     /* The user wants to set the interval to newPeriod. Refuse bogus values
        and return false, or accept the change, broadcast it, and return
        true */
     synchronized boolean setInterval(int newPeriod) {
-       if (newPeriod < 1 || newPeriod > 65535)
-           return false;
-       interval = newPeriod;
-       version++;
-       sendInterval();
-       return true;
+    if (newPeriod < 1 || newPeriod > 65535)
+        return false;
+    interval = newPeriod;
+    version++;
+    sendInterval();
+    return true;
     }
 
     /* Broadcast a version+interval message. */
     void sendInterval() {
-       OscilloscopeMsg omsg = new OscilloscopeMsg();
-
-       omsg.set_version(version);
-       omsg.set_interval(interval);
-       try {
-           mote.send(MoteIF.TOS_BCAST_ADDR, omsg);
-       }
-       catch (IOException e) {
-           window.error("Cannot send message to mote");
-       }
+    OscilloscopeMsg omsg = new OscilloscopeMsg();
+
+    omsg.set_version(version);
+    omsg.set_interval(interval);
+    try {
+        mote.send(MoteIF.TOS_BCAST_ADDR, omsg);
+    }
+    catch (IOException e) {
+        window.error("Cannot send message to mote");
+    }
     }
 
     /* User wants to clear all data. */
     void clear() {
-       data = new Data(this);
+    data = new Data(this);
     }
 
     public static void main(String[] args) {
-       Oscilloscope me = new Oscilloscope();
-       me.run();
+    Oscilloscope me = new Oscilloscope();
+    me.run();
     }
 }