Merge remote-tracking branch 'upstream/master'

RoboCup-SPL · Apr 2, 2014 · a1cb669 · a1cb669
2 parents c12cbde + 55f7daa
commit a1cb669
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/src/analyzer/GUI.java b/src/analyzer/GUI.java
@@ -5,6 +5,8 @@
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Dimension;
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
 import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -68,8 +70,10 @@ public class GUI extends JFrame implements ListSelectionListener
     public GUI()
     {
         super(TITLE);
-        Dimension desktop = Toolkit.getDefaultToolkit().getScreenSize();
-        setLocation((desktop.width-WINDOW_WIDTH)/2, (desktop.height-WINDOW_HEIGHT)/2);
+        GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
+        int width = gd.getDisplayMode().getWidth();
+        int height = gd.getDisplayMode().getHeight();
+        setLocation((width-WINDOW_WIDTH)/2, (height-WINDOW_HEIGHT)/2);
         setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         setSize(WINDOW_WIDTH, WINDOW_HEIGHT);
         TotalScaleLayout layout = new TotalScaleLayout(this);

diff --git a/src/controller/ui/GUI.java b/src/controller/ui/GUI.java
@@ -264,8 +264,10 @@ public GUI(boolean fullscreen, AdvancedData data)
         super(WINDOW_TITLE);
         setSize(WINDOW_WIDTH, WINDOW_HEIGHT);
         setResizable(true);
-        Dimension desktop = Toolkit.getDefaultToolkit().getScreenSize();
-        setLocation((desktop.width-WINDOW_WIDTH)/2, (desktop.height-WINDOW_HEIGHT)/2);
+        GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
+        int width = gd.getDisplayMode().getWidth();
+        int height = gd.getDisplayMode().getHeight();
+        setLocation((width-WINDOW_WIDTH)/2, (height-WINDOW_HEIGHT)/2);
 
         addWindowListener(new WindowAdapter()
         {

diff --git a/src/controller/ui/StartInput.java b/src/controller/ui/StartInput.java
@@ -10,6 +10,8 @@
 import java.awt.Dimension;
 import java.awt.FlowLayout;
 import java.awt.Graphics;
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
 import java.awt.Image;
 import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
@@ -87,8 +89,10 @@ public StartInput(boolean fullscreenMode)
     {
         super(WINDOW_TITLE);
 
-        Dimension desktop = Toolkit.getDefaultToolkit().getScreenSize();
-        setLocation((desktop.width-WINDOW_WIDTH)/2, (desktop.height-WINDOW_HEIGHT)/2);
+        GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
+        int width = gd.getDisplayMode().getWidth();
+        int height = gd.getDisplayMode().getHeight();
+        setLocation((width-WINDOW_WIDTH)/2, (height-WINDOW_HEIGHT)/2);
         setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         setResizable(false);
         setLayout(new FlowLayout(FlowLayout.CENTER, 0, STANDARD_SPACE));

diff --git a/src/data/SPLCoachMessage.java b/src/data/SPLCoachMessage.java
@@ -14,8 +14,8 @@ public class SPLCoachMessage implements Serializable
     public static final int SPL_COACH_MESSAGE_STRUCT_VERSION = 2;
     public static final int SPL_COACH_MESSAGE_SIZE = 40;
     public static final long SPL_COACH_MESSAGE_RECEIVE_INTERVALL = 10000; // in ms
-    public static final long SPL_COACH_MESSAGE_MIN_SEND_INTERVALL = 8000; // in ms
-    public static final long SPL_COACH_MESSAGE_MAX_SEND_INTERVALL = 12000; // in ms
+    public static final long SPL_COACH_MESSAGE_MIN_SEND_INTERVALL = 3000; // in ms
+    public static final long SPL_COACH_MESSAGE_MAX_SEND_INTERVALL = 6000; // in ms
     public static final int SIZE = 4 // header size
                                    + 1 // byte for the version
                                    + 1 // team number