first cut at turnon scripts for EasyTimer v2

[fw/altos] / altosui / AltosFlightUI.java

diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index 12277f8921e193a437a002b58a16dfc8c2e7bcde..a2d0c3645b898daadb7f7c00e10d141e9aabe45d 100644 (file)
--- a/altosui/AltosFlightUI.java
+++ b/altosui/AltosFlightUI.java
@@ -23,8 +23,8 @@ import java.awt.event.*;
 import javax.swing.*;
 import java.util.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_11.*;
-import org.altusmetrum.altosuilib_11.*;
+import org.altusmetrum.altoslib_14.*;
+import org.altusmetrum.altosuilib_14.*;
 
 public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
        AltosVoice              voice;
@@ -115,11 +115,8 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
 
                JComponent tab = which_tab(state);
                if (tab != cur_tab) {
-                       System.out.printf("checking tab for state %s\n", AltosLib.state_name(state.state()));
-                       if (cur_tab == pane.getSelectedComponent()) {
-                               System.out.printf("switch tabs\n");
+                       if (cur_tab == pane.getSelectedComponent())
                                pane.setSelectedComponent(tab);
-                       }
                        cur_tab = tab;
                }
 
@@ -189,7 +186,7 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
                voice = in_voice;
                reader = in_reader;
 
-               bag = getContentPane();
+               bag = getScrollablePane();
                bag.setLayout(new GridBagLayout());
 
                setTitle(String.format("AltOS %s", reader.name));