X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fnet%2Fsf%2Fopenrocket%2Fgui%2Fconfigdialog%2FParachuteConfig.java;fp=src%2Fnet%2Fsf%2Fopenrocket%2Fgui%2Fconfigdialog%2FParachuteConfig.java;h=f41ca5ce2c0733db0b0a5edccf00e7ec6586f3e1;hb=b3c3c1071dfdca4c6b3eb9935dc461201abdaf60;hp=c058725d95e7d68935e5030808d182d8147a64df;hpb=fa61335265b0af5f9bc8800df953d41cde2d75f6;p=debian%2Fopenrocket diff --git a/src/net/sf/openrocket/gui/configdialog/ParachuteConfig.java b/src/net/sf/openrocket/gui/configdialog/ParachuteConfig.java index c058725d..f41ca5ce 100644 --- a/src/net/sf/openrocket/gui/configdialog/ParachuteConfig.java +++ b/src/net/sf/openrocket/gui/configdialog/ParachuteConfig.java @@ -52,7 +52,8 @@ public class ParachuteConfig extends RecoveryDeviceConfig { panel.add(new JLabel("Material:")); - JComboBox combo = new JComboBox(new MaterialModel(component, Material.Type.SURFACE)); + JComboBox combo = new JComboBox(new MaterialModel(panel, component, + Material.Type.SURFACE)); combo.setToolTipText("The component material affects the weight of the component."); panel.add(combo,"spanx 3, growx, wrap paragraph"); @@ -112,7 +113,7 @@ public class ParachuteConfig extends RecoveryDeviceConfig { panel.add(new JLabel("Material:")); - combo = new JComboBox(new MaterialModel(component, Material.Type.LINE, + combo = new JComboBox(new MaterialModel(panel, component, Material.Type.LINE, "LineMaterial")); panel.add(combo,"spanx 3, growx, wrap");