updates for 0.9.4

[debian/openrocket] / src / net / sf / openrocket / gui / dialogs / ComponentAnalysisDialog.java
diff --git a/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java b/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java

index 3c900f256af0a7ca21b3b1e2f533077c295021b3..6ff42883a2a5e19873c61975863b411144d76d12 100644 (file)
--- a/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java
+++ b/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java
@@ -1,6 +1,7 @@
  package net.sf.openrocket.gui.dialogs;
  
  import static net.sf.openrocket.unit.Unit.NOUNIT2;
+import static net.sf.openrocket.util.Chars.ALPHA;
  
  import java.awt.Color;
  import java.awt.Component;
@@ -45,8 +46,8 @@ import net.sf.openrocket.gui.adaptors.ColumnTableModel;
  import net.sf.openrocket.gui.adaptors.DoubleModel;
  import net.sf.openrocket.gui.adaptors.MotorConfigurationModel;
  import net.sf.openrocket.gui.components.BasicSlider;
-import net.sf.openrocket.gui.components.ResizeLabel;
  import net.sf.openrocket.gui.components.StageSelector;
+import net.sf.openrocket.gui.components.StyledLabel;
  import net.sf.openrocket.gui.components.UnitSelector;
  import net.sf.openrocket.gui.scalefigure.RocketPanel;
  import net.sf.openrocket.rocketcomponent.Configuration;
@@ -203,7 +204,7 @@ public class ComponentAnalysisDialog extends JDialog implements ChangeListener {
                                                 return unit.toString(cpData.get(row).cp.x);
                                         }
                                 },
-                               new Column("<html>C<sub>N<sub>\u03b1</sub></sub>") {
+                               new Column("<html>C<sub>N<sub>"+ALPHA+"</sub></sub>") {
                                         @Override public Object getValueAt(int row) {
                                                 return NOUNIT2.toString(cpData.get(row).cp.weight);
                                         }
@@ -370,14 +371,14 @@ public class ComponentAnalysisDialog extends JDialog implements ChangeListener {
                 });
                 
  
-               panel.add(new ResizeLabel("Reference length: ", -1), 
+               panel.add(new StyledLabel("Reference length: ", -1), 
                                 "span, split, gapleft para, gapright rel");
                 DoubleModel dm = new DoubleModel(conditions, "RefLength", UnitGroup.UNITS_LENGTH);
                 UnitSelector sel = new UnitSelector(dm, true);
                 sel.resizeFont(-1);
                 panel.add(sel, "gapright para");
                 
-               panel.add(new ResizeLabel("Reference area: ", -1), "gapright rel");
+               panel.add(new StyledLabel("Reference area: ", -1), "gapright rel");
                 dm = new DoubleModel(conditions, "RefArea", UnitGroup.UNITS_AREA);
                 sel = new UnitSelector(dm, true);
                 sel.resizeFont(-1);
@@ -412,9 +413,11 @@ public class ComponentAnalysisDialog extends JDialog implements ChangeListener {
                 panel.add(button,"span, split, tag cancel");
                 
  
+               this.setLocationByPlatform(true);
                 setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-               GUIUtil.installEscapeCloseOperation(this);
                 pack();
+               
+               GUIUtil.setDisposableDialogOptions(this, null);
         }