bugfixes

RoboCup-SPL · Oct 3, 2015 · d228d27 · d228d27
1 parent 77d9e64
commit d228d27
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/build.xml b/build.xml
@@ -20,6 +20,7 @@
     <target name="compile">
         <delete dir="${classes.dir}" quiet="true" />
         <mkdir dir="${classes.dir}"/>
+        <!-- debug flags: debug="true" debuglevel="lines,vars,source" -->
         <javac srcdir="${src.dir}" destdir="${classes.dir}" includeantruntime="false" source="1.7" target="1.7" encoding="utf-8">
             <compilerarg value="-Xlint:-options"/> <!-- ignore nagging about missing bootstrap class path -->
             <compilerarg value="-Xlint:unchecked"/>

diff --git a/src/teamcomm/data/RobotState.java b/src/teamcomm/data/RobotState.java
@@ -70,7 +70,9 @@ public void registerMessage(final SPLStandardMessage message) {
             playerNumber = (int) message.playerNum;
         }
         lastMessageTimestamp = System.currentTimeMillis();
-        recentMessageTimestamps.addFirst(lastMessageTimestamp);
+        synchronized (recentMessageTimestamps) {
+            recentMessageTimestamps.addFirst(lastMessageTimestamp);
+        }
         messageCount++;
 
         for (final RobotStateEventListener listener : listeners.getListeners(RobotStateEventListener.class)) {
@@ -103,14 +105,16 @@ public SPLStandardMessage getLastMessage() {
      * @return number of messages per second
      */
     public double getMessagesPerSecond() {
-        final ListIterator<Long> it = recentMessageTimestamps.listIterator(recentMessageTimestamps.size());
+        synchronized (recentMessageTimestamps) {
+            final ListIterator<Long> it = recentMessageTimestamps.listIterator(recentMessageTimestamps.size());
 
-        final long curTime = System.currentTimeMillis();
-        while (curTime - it.previous() > AVERAGE_CALCULATION_TIME) {
-            it.remove();
-        }
+            final long curTime = System.currentTimeMillis();
+            while (curTime - it.previous() > AVERAGE_CALCULATION_TIME) {
+                it.remove();
+            }
 
-        return recentMessageTimestamps.size() > 0 ? (recentMessageTimestamps.size() * 1000.0 / Math.max(1000, curTime - recentMessageTimestamps.getLast())) : 0;
+            return recentMessageTimestamps.size() > 0 ? (recentMessageTimestamps.size() * 1000.0 / Math.max(1000, curTime - recentMessageTimestamps.getLast())) : 0;
+        }
     }
 
     /**

diff --git a/src/teamcomm/gui/RobotPanel.java b/src/teamcomm/gui/RobotPanel.java
@@ -76,6 +76,7 @@ public void run() {
                 setBorder(BorderFactory.createTitledBorder(BorderFactory.createLineBorder(getForeground()), robot.getAddress(), TitledBorder.CENTER, TitledBorder.TOP));
                 setLayout(new OverlayLayout(robotPanel));
                 setPreferredSize(new Dimension(PANEL_WIDTH, PANEL_HEIGHT));
+                setMaximumSize(new Dimension(PANEL_WIDTH, PANEL_HEIGHT));
 
                 foregroundPanel.setLayout(new BoxLayout(foregroundPanel, BoxLayout.Y_AXIS));
                 foregroundPanel.setOpaque(false);