Minor code cleanup

se/sics/mspsim/chip/CC1120.java

@@ -830,16 +830,16 @@ public class CC1120 extends Radio802154 implements USARTListener {
 	}
 
 	private void printRXFIFO() {
-		System.out.print(String.format("RXFIFO[%03d]: ", rxfifo.size()));
+		System.out.printf("RXFIFO[%03d]: ", rxfifo.size());
 		for (int i = 0; i < rxfifo.size(); i++) {
-			System.out.print(String.format("%02x", rxfifo.get(i)));
+			System.out.printf("%02x", rxfifo.get(i));
 		}
 		System.out.println();
 	}
 	private void printTXFIFO() {
-		System.out.print(String.format("TXFIFO[%03d]: ", txfifo.size()));
+		System.out.printf("TXFIFO[%03d]: ", txfifo.size());
 		for (int i = 0; i < txfifo.size(); i++) {
-			System.out.print(String.format("%02x", txfifo.get(i)));
+			System.out.printf("%02x", txfifo.get(i));
 		}
 		System.out.println();
 	}

se/sics/mspsim/chip/M25P80.java

@@ -41,6 +41,8 @@
 
 package se.sics.mspsim.chip;
 import java.io.IOException;
+import java.util.Arrays;
+
 import se.sics.mspsim.core.*;
 import se.sics.mspsim.core.EmulationLogger.WarningType;
 import se.sics.mspsim.util.Utils;
@@ -170,9 +172,7 @@ public class M25P80 extends ExternalFlash implements USARTListener, PortListener
           pos++;
           if (pos == 3) {
             // Clear buffer
-            for (int i = 0; i < buffer.length; i++) {
-              buffer[i] = (byte) 0xff;
-            }
+            Arrays.fill(buffer, (byte) 0xff);
             blockWriteAddress = readAddress & 0xfff00;
             if (DEBUG) {
               log("programming at $" + Integer.toHexString(readAddress));
@@ -356,9 +356,7 @@ public class M25P80 extends ExternalFlash implements USARTListener, PortListener
     writeStatus(SECTOR_ERASE_MILLIS);
     int sectorAddress = address & 0xf0000;
     loadedAddress = -1;
-    for (int i = 0; i < buffer.length; i++) {
-      buffer[i] = (byte)0xff;
-    }
+    Arrays.fill(buffer, (byte) 0xff);
     // Erase a complete sector
     blockWriteAddress = sectorAddress;
     for (int i = 0; i < 0x100; i++) {

se/sics/mspsim/core/DisAsm.java

@@ -630,14 +630,14 @@ public class DisAsm implements MSP430Constants {
   }
 
   private static String dumpMem(int pc, int size, int[] memory) {
-    String output = "";
+    StringBuilder output = new StringBuilder();
     for (int i = 0, n = size; i < n; i++) {
       if (size > i) {
-	output += Utils.hex8(memory[pc + i]) + " ";
+	output.append(Utils.hex8(memory[pc + i])).append(" ");
       } else {
-	output += "   ";
+	output.append("   ");
       }
     }
-    return output;
+    return output.toString();
   }
 }

se/sics/mspsim/core/MSP430Core.java

@@ -38,6 +38,7 @@
 package se.sics.mspsim.core;
 import java.io.PrintStream;
 import java.util.ArrayList;
+import java.util.Arrays;
 
 import se.sics.mspsim.core.EmulationLogger.WarningType;
 import se.sics.mspsim.core.Memory.AccessMode;
@@ -267,9 +268,7 @@ public class MSP430Core extends Chip implements MSP430Constants {
     config.setup(this, ioUnits);
 
     /* timers after ports ? */
-    for (int i = 0; i < timers.length; i++) {
-        ioUnits.add(timers[i]);
-    }
+    ioUnits.addAll(Arrays.asList(timers));
 
     watchdog = new Watchdog(this, config.watchdogOffset);
     ioSegment.setIORange(config.watchdogOffset, 1, watchdog);

se/sics/mspsim/extutil/highlight/TextScanner.java

@@ -15,7 +15,7 @@ public class TextScanner extends Scanner {
           + "7333333333333333333333333337777473333333333333333333333333377771";
 
   static final byte[] kinds = new byte[cs.length()];
-  {
+  static {
     for (int i = 0; i < cs.length(); i++) {
       kinds[i] = (byte) (cs.charAt(i) - '0');
     }

se/sics/mspsim/ui/DebugUI.java

@@ -78,7 +78,7 @@ public class DebugUI extends JPanel {
 
     listModel = new DbgListModel();
     disList = new JList<DbgInstruction>(listModel);
-    disList.setFont(new Font("courier", 0, 12));
+    disList.setFont(new Font("courier", Font.PLAIN, 12));
     disList.setCellRenderer(new MyCellRenderer());
     disList.setPreferredSize(new Dimension(500, 350));
     add(disList, BorderLayout.CENTER);