altosui: Add config and pyro tabs to graph widget

[fw/altos] / altosuilib / AltosRomconfigUI.java

diff --git a/altosuilib/AltosRomconfigUI.java b/altosuilib/AltosRomconfigUI.java
index eb2e8333d5df9597c2eb767cc0a6be31a7e04441..44d3a9f8a685687212aee908c7cbf1a94daadfe4 100644 (file)
--- a/altosuilib/AltosRomconfigUI.java
+++ b/altosuilib/AltosRomconfigUI.java
@@ -16,12 +16,12 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_13;
+package org.altusmetrum.altosuilib_14;
 
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_13.*;
+import org.altusmetrum.altoslib_14.*;
 
 public class AltosRomconfigUI
        extends AltosUIDialog
@@ -51,7 +51,7 @@ public class AltosRomconfigUI
                Insets il = new Insets(4,4,4,4);
                Insets ir = new Insets(4,4,4,4);
 
-               pane = getContentPane();
+               pane = getScrollablePane();
                pane.setLayout(new GridBagLayout());
 
                int y = 0;
@@ -74,7 +74,10 @@ public class AltosRomconfigUI
                c.weightx = 1;
                c.anchor = GridBagConstraints.LINE_START;
                c.insets = ir;
-               product_value = new JLabel(config.usb_product);
+               String product = "unknown";
+               if (config != null)
+                       product = config.usb_product;
+               product_value = new JLabel(product);
                pane.add(product_value, c);
 
                y++;