hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up structure a bit

Browse Source 
(I'm doing this for a later commit I will push in this PR)
This commit is contained in:
SiboVG 2022-07-28 01:06:55 +02:00
parent 96f3e671b0
commit 8051e5c9c1
6 changed files with 345 additions and 340 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
swing/src/net/sf/openrocket/gui/main/BasicFrame.java
View File

@ -60,7 +60,6 @@ import net.sf.openrocket.gui.dialogs.preferences.PreferencesDialog;
import net.sf.openrocket.gui.figure3d.photo.PhotoFrame; import net.sf.openrocket.gui.figure3d.photo.PhotoFrame;
import net.sf.openrocket.gui.help.tours.GuidedTourSelectionDialog; import net.sf.openrocket.gui.help.tours.GuidedTourSelectionDialog;
import net.sf.openrocket.gui.main.componenttree.ComponentTree; import net.sf.openrocket.gui.main.componenttree.ComponentTree;
import net.sf.openrocket.gui.main.flightconfigpanel.FlightConfigurationPanel;
import net.sf.openrocket.gui.scalefigure.RocketPanel; import net.sf.openrocket.gui.scalefigure.RocketPanel;
import net.sf.openrocket.gui.util.DummyFrameMenuOSX; import net.sf.openrocket.gui.util.DummyFrameMenuOSX;
import net.sf.openrocket.gui.util.FileHelper; import net.sf.openrocket.gui.util.FileHelper;
@ -276,6 +275,7 @@ public class BasicFrame extends JFrame {
* with the left component the design tree and the right component buttons * with the left component the design tree and the right component buttons
* for adding components. * for adding components.
*/ */
// TODO LOW: Put this in a separate file...
private JComponent designTab() { private JComponent designTab() {
JSplitPane horizontal = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true); JSplitPane horizontal = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true);
horizontal.setResizeWeight(0.5); horizontal.setResizeWeight(0.5);

6
swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurationPanel.java → swing/src/net/sf/openrocket/gui/main/FlightConfigurationPanel.java
View File

@ -1,4 +1,4 @@
package net.sf.openrocket.gui.main.flightconfigpanel; package net.sf.openrocket.gui.main;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
@ -20,7 +20,9 @@ import net.miginfocom.swing.MigLayout;
import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.document.OpenRocketDocument;
import net.sf.openrocket.document.Simulation; import net.sf.openrocket.document.Simulation;
import net.sf.openrocket.gui.dialogs.flightconfiguration.RenameConfigDialog; import net.sf.openrocket.gui.dialogs.flightconfiguration.RenameConfigDialog;
import net.sf.openrocket.gui.main.BasicFrame; import net.sf.openrocket.gui.main.flightconfigpanel.MotorConfigurationPanel;
import net.sf.openrocket.gui.main.flightconfigpanel.RecoveryConfigurationPanel;
import net.sf.openrocket.gui.main.flightconfigpanel.SeparationConfigurationPanel;
import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.rocketcomponent.ComponentChangeEvent; import net.sf.openrocket.rocketcomponent.ComponentChangeEvent;
import net.sf.openrocket.rocketcomponent.FlightConfigurableComponent; import net.sf.openrocket.rocketcomponent.FlightConfigurableComponent;

666
swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurablePanel.java
View File

@ -1,334 +1,334 @@
package net.sf.openrocket.gui.main.flightconfigpanel; package net.sf.openrocket.gui.main.flightconfigpanel;
import java.awt.Color; import java.awt.Color;
import java.awt.Component; import java.awt.Component;
import java.awt.Font; import java.awt.Font;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.List;
import java.util.List;
import javax.swing.JComponent;
import javax.swing.JComponent; import javax.swing.JLabel;
import javax.swing.JLabel; import javax.swing.JPanel;
import javax.swing.JPanel; import javax.swing.JTable;
import javax.swing.JTable; import javax.swing.ListSelectionModel;
import javax.swing.ListSelectionModel; import javax.swing.UIManager;
import javax.swing.UIManager; import javax.swing.border.Border;
import javax.swing.border.Border; import javax.swing.border.EmptyBorder;
import javax.swing.border.EmptyBorder; import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener;
import javax.swing.event.ListSelectionListener; import javax.swing.table.AbstractTableModel;
import javax.swing.table.AbstractTableModel; import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.DefaultTableCellRenderer;
import net.sf.openrocket.gui.main.FlightConfigurationPanel;
import net.sf.openrocket.util.ArrayList; import net.sf.openrocket.util.ArrayList;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import net.miginfocom.swing.MigLayout; import net.miginfocom.swing.MigLayout;
import net.sf.openrocket.formatting.RocketDescriptor; import net.sf.openrocket.formatting.RocketDescriptor;
import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.gui.util.GUIUtil;
import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.rocketcomponent.ComponentChangeEvent; import net.sf.openrocket.rocketcomponent.ComponentChangeEvent;
import net.sf.openrocket.rocketcomponent.ComponentChangeListener; import net.sf.openrocket.rocketcomponent.ComponentChangeListener;
import net.sf.openrocket.rocketcomponent.FlightConfigurableComponent; import net.sf.openrocket.rocketcomponent.FlightConfigurableComponent;
import net.sf.openrocket.rocketcomponent.FlightConfigurationId; import net.sf.openrocket.rocketcomponent.FlightConfigurationId;
import net.sf.openrocket.rocketcomponent.Rocket; import net.sf.openrocket.rocketcomponent.Rocket;
import net.sf.openrocket.startup.Application; import net.sf.openrocket.startup.Application;
import net.sf.openrocket.util.Pair; import net.sf.openrocket.util.Pair;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public abstract class FlightConfigurablePanel<T extends FlightConfigurableComponent> extends JPanel implements ComponentChangeListener { public abstract class FlightConfigurablePanel<T extends FlightConfigurableComponent> extends JPanel implements ComponentChangeListener {
protected static final Translator trans = Application.getTranslator(); protected static final Translator trans = Application.getTranslator();
private static final Logger log = LoggerFactory.getLogger(FlightConfigurablePanel.class); private static final Logger log = LoggerFactory.getLogger(FlightConfigurablePanel.class);
protected RocketDescriptor descriptor = Application.getInjector().getInstance(RocketDescriptor.class); protected RocketDescriptor descriptor = Application.getInjector().getInstance(RocketDescriptor.class);
protected final FlightConfigurationPanel flightConfigurationPanel; protected final FlightConfigurationPanel flightConfigurationPanel;
protected final Rocket rocket; protected final Rocket rocket;
protected final JTable table; protected final JTable table;
public FlightConfigurablePanel(final FlightConfigurationPanel flightConfigurationPanel, Rocket rocket) { public FlightConfigurablePanel(final FlightConfigurationPanel flightConfigurationPanel, Rocket rocket) {
super(new MigLayout("fill")); super(new MigLayout("fill"));
this.flightConfigurationPanel = flightConfigurationPanel; this.flightConfigurationPanel = flightConfigurationPanel;
this.rocket = rocket; this.rocket = rocket;
table = doTableInitialization(); table = doTableInitialization();
installTableListener(); installTableListener();
synchronizeConfigurationSelection(); synchronizeConfigurationSelection();
} }
/** /**
* Update the data in the table, with component change event type {cce} * Update the data in the table, with component change event type {cce}
* @param cce index of the ComponentChangeEvent to use (e.g. ComponentChangeEvent.NONFUNCTIONAL_CHANGE) * @param cce index of the ComponentChangeEvent to use (e.g. ComponentChangeEvent.NONFUNCTIONAL_CHANGE)
*/ */
public void fireTableDataChanged(int cce) { public void fireTableDataChanged(int cce) {
int selectedRow = table.getSelectedRow(); int selectedRow = table.getSelectedRow();
int selectedColumn = table.getSelectedColumn(); int selectedColumn = table.getSelectedColumn();
this.rocket.fireComponentChangeEvent(cce); this.rocket.fireComponentChangeEvent(cce);
((AbstractTableModel)table.getModel()).fireTableDataChanged(); ((AbstractTableModel)table.getModel()).fireTableDataChanged();
restoreSelection(selectedRow,selectedColumn); restoreSelection(selectedRow,selectedColumn);
updateButtonState(); updateButtonState();
} }
protected abstract void updateButtonState(); public abstract void updateButtonState();
@Override @Override
public void componentChanged(ComponentChangeEvent e) { public void componentChanged(ComponentChangeEvent e) {
this.synchronizeConfigurationSelection(); this.synchronizeConfigurationSelection();
} }
/** /**
* Initialize the table using the specific implementation's initializeTable * Initialize the table using the specific implementation's initializeTable
* method and then select the row to match what the rocket's current selected * method and then select the row to match what the rocket's current selected
* configuration is. * configuration is.
* *
* @return the JTable created * @return the JTable created
*/ */
private final JTable doTableInitialization() { private final JTable doTableInitialization() {
JTable table = this.initializeTable(); JTable table = this.initializeTable();
FlightConfigurationId current = this.rocket.getSelectedConfiguration().getFlightConfigurationID(); FlightConfigurationId current = this.rocket.getSelectedConfiguration().getFlightConfigurationID();
int col = (table.getColumnCount() > 1) ? table.getColumnCount() - 1 : 0; int col = (table.getColumnCount() > 1) ? table.getColumnCount() - 1 : 0;
for (int row = 0; row < table.getRowCount(); row++) { for (int row = 0; row < table.getRowCount(); row++) {
FlightConfigurationId rowFCID = rocket.getId(row); FlightConfigurationId rowFCID = rocket.getId(row);
if (rowFCID.equals(current)) { if (rowFCID.equals(current)) {
table.changeSelection(row, col, false, false); table.changeSelection(row, col, false, false);
break; break;
} }
} }
return table; return table;
} }
protected final void synchronizeConfigurationSelection() { public final void synchronizeConfigurationSelection() {
FlightConfigurationId currentRocketFCID = rocket.getSelectedConfiguration().getFlightConfigurationID(); FlightConfigurationId currentRocketFCID = rocket.getSelectedConfiguration().getFlightConfigurationID();
FlightConfigurationId selectedFCID = getSelectedConfigurationId(); FlightConfigurationId selectedFCID = getSelectedConfigurationId();
if ( currentRocketFCID == FlightConfigurationId.DEFAULT_VALUE_FCID ) { if ( currentRocketFCID == FlightConfigurationId.DEFAULT_VALUE_FCID ) {
// need to unselect // need to unselect
table.clearSelection(); table.clearSelection();
} else if ( !currentRocketFCID.equals(selectedFCID)){ } else if ( !currentRocketFCID.equals(selectedFCID)){
// Need to change selection // Need to change selection
// We'll select the correct row, in the currently selected column. // We'll select the correct row, in the currently selected column.
int col = table.getSelectedColumn(); int col = table.getSelectedColumn();
if ( col < 0 ) { if ( col < 0 ) {
col = (table.getColumnCount() > 1) ? table.getColumnCount() - 1 : 0; col = (table.getColumnCount() > 1) ? table.getColumnCount() - 1 : 0;
} }
for( int rowNum = 0; rowNum < table.getRowCount(); rowNum++ ) { for( int rowNum = 0; rowNum < table.getRowCount(); rowNum++ ) {
FlightConfigurationId rowFCID = rocket.getId(rowNum ); FlightConfigurationId rowFCID = rocket.getId(rowNum );
if ( rowFCID.equals(currentRocketFCID) ) { if ( rowFCID.equals(currentRocketFCID) ) {
table.changeSelection(rowNum, col, false, false); table.changeSelection(rowNum, col, false, false);
break; break;
} }
} }
} }
} }
protected void restoreSelection( int row, int col ) { protected void restoreSelection( int row, int col ) {
if ( row <= 0 || col <= 0 ) { if ( row <= 0 || col <= 0 ) {
synchronizeConfigurationSelection(); synchronizeConfigurationSelection();
return; return;
} }
if ( row >= table.getRowCount() || col >= table.getColumnCount() ) { if ( row >= table.getRowCount() || col >= table.getColumnCount() ) {
synchronizeConfigurationSelection(); synchronizeConfigurationSelection();
return; return;
} }
table.changeSelection(row, col, true, false); table.changeSelection(row, col, true, false);
table.requestFocusInWindow(); table.requestFocusInWindow();
} }
protected void installTableListener() { protected void installTableListener() {
table.getSelectionModel().addListSelectionListener(new ListSelectionListener() { table.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
@Override @Override
public void valueChanged(ListSelectionEvent e) { public void valueChanged(ListSelectionEvent e) {
if ( e.getValueIsAdjusting() ) { if ( e.getValueIsAdjusting() ) {
return; return;
} }
/* Find the selected row and set it as the current selected configuration /* Find the selected row and set it as the current selected configuration
* for the rocket. This will propagate the event to ensure that other * for the rocket. This will propagate the event to ensure that other
* pieces of the UI are updated and match the table selection. * pieces of the UI are updated and match the table selection.
*/ */
int firstrow = e.getFirstIndex(); int firstrow = e.getFirstIndex();
int lastrow = e.getLastIndex(); int lastrow = e.getLastIndex();
ListSelectionModel model = (ListSelectionModel) e.getSource(); ListSelectionModel model = (ListSelectionModel) e.getSource();
for( int row = firstrow; row <= lastrow; row ++) { for( int row = firstrow; row <= lastrow; row ++) {
if ( model.isSelectedIndex(row) ) { if ( model.isSelectedIndex(row) ) {
FlightConfigurationId fcid = (FlightConfigurationId) table.getValueAt(row, table.convertColumnIndexToView(0)); FlightConfigurationId fcid = (FlightConfigurationId) table.getValueAt(row, table.convertColumnIndexToView(0));
rocket.setSelectedConfiguration(fcid); rocket.setSelectedConfiguration(fcid);
return; return;
} }
} }
} }
}); });
} }
/** /**
* Override this method to create the embedded JTable and it's backing Model. * Override this method to create the embedded JTable and it's backing Model.
* *
* @return * @return
*/ */
protected abstract JTable initializeTable(); protected abstract JTable initializeTable();
protected T getSelectedComponent() { protected T getSelectedComponent() {
int col = table.convertColumnIndexToModel(table.getSelectedColumn()); int col = table.convertColumnIndexToModel(table.getSelectedColumn());
int row = table.convertRowIndexToModel(table.getSelectedRow()); int row = table.convertRowIndexToModel(table.getSelectedRow());
if ( row < 0 || col < 0 ) { if ( row < 0 || col < 0 ) {
return null; return null;
} }
Object tableValue = table.getModel().getValueAt(row, col); Object tableValue = table.getModel().getValueAt(row, col);
if ( tableValue instanceof Pair ) { if ( tableValue instanceof Pair ) {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
Pair<String,T> selectedComponent = (Pair<String,T>) tableValue; Pair<String,T> selectedComponent = (Pair<String,T>) tableValue;
return selectedComponent.getV(); return selectedComponent.getV();
} }
return null; return null;
} }
protected List<T> getSelectedComponents() { protected List<T> getSelectedComponents() {
int[] cols = Arrays.stream(table.getSelectedColumns()).map(table::convertRowIndexToModel).toArray(); int[] cols = Arrays.stream(table.getSelectedColumns()).map(table::convertRowIndexToModel).toArray();
int[] rows = Arrays.stream(table.getSelectedRows()).map(table::convertRowIndexToModel).toArray(); int[] rows = Arrays.stream(table.getSelectedRows()).map(table::convertRowIndexToModel).toArray();
if (Arrays.stream(cols).min().isEmpty() || Arrays.stream(rows).min().isEmpty() || if (Arrays.stream(cols).min().isEmpty() || Arrays.stream(rows).min().isEmpty() ||
Arrays.stream(cols).min().getAsInt() < 0 || Arrays.stream(rows).min().getAsInt() < 0) { Arrays.stream(cols).min().getAsInt() < 0 || Arrays.stream(rows).min().getAsInt() < 0) {
return null; return null;
} }
List<T> components = new ArrayList<>(); List<T> components = new ArrayList<>();
for (int row : rows) { for (int row : rows) {
for (int col : cols) { for (int col : cols) {
Object tableValue = table.getModel().getValueAt(row, col); Object tableValue = table.getModel().getValueAt(row, col);
if (tableValue instanceof Pair) { if (tableValue instanceof Pair) {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
Pair<String, T> selectedComponent = (Pair<String, T>) tableValue; Pair<String, T> selectedComponent = (Pair<String, T>) tableValue;
components.add(selectedComponent.getV()); components.add(selectedComponent.getV());
} }
} }
} }
return components; return components;
} }
protected FlightConfigurationId getSelectedConfigurationId() { protected FlightConfigurationId getSelectedConfigurationId() {
int col = table.convertColumnIndexToModel(table.getSelectedColumn()); int col = table.convertColumnIndexToModel(table.getSelectedColumn());
int row = table.convertRowIndexToModel(table.getSelectedRow()); int row = table.convertRowIndexToModel(table.getSelectedRow());
if ( row < 0 || col < 0 || row >= table.getRowCount() || col >= table.getColumnCount() ) { if ( row < 0 || col < 0 || row >= table.getRowCount() || col >= table.getColumnCount() ) {
return null; return null;
} }
Object tableValue = table.getModel().getValueAt(row, col); Object tableValue = table.getModel().getValueAt(row, col);
if ( tableValue instanceof Pair ) { if ( tableValue instanceof Pair ) {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
Pair<FlightConfigurationId,T> selectedComponent = (Pair<FlightConfigurationId,T>) tableValue; Pair<FlightConfigurationId,T> selectedComponent = (Pair<FlightConfigurationId,T>) tableValue;
FlightConfigurationId fcid = selectedComponent.getU(); FlightConfigurationId fcid = selectedComponent.getU();
return fcid; return fcid;
} else if ( tableValue instanceof FlightConfigurationId ){ } else if ( tableValue instanceof FlightConfigurationId ){
return (FlightConfigurationId) tableValue; return (FlightConfigurationId) tableValue;
} }
return FlightConfigurationId.ERROR_FCID; return FlightConfigurationId.ERROR_FCID;
} }
protected List<FlightConfigurationId> getSelectedConfigurationIds() { public List<FlightConfigurationId> getSelectedConfigurationIds() {
int col = table.convertColumnIndexToModel(table.getSelectedColumn()); int col = table.convertColumnIndexToModel(table.getSelectedColumn());
int[] rows = Arrays.stream(table.getSelectedRows()).map(table::convertRowIndexToModel).toArray(); int[] rows = Arrays.stream(table.getSelectedRows()).map(table::convertRowIndexToModel).toArray();
if (Arrays.stream(rows).min().isEmpty() || Arrays.stream(rows).min().getAsInt() < 0 || col < 0 || if (Arrays.stream(rows).min().isEmpty() || Arrays.stream(rows).min().getAsInt() < 0 || col < 0 ||
Arrays.stream(rows).max().getAsInt() >= table.getRowCount() || col >= table.getColumnCount() ) { Arrays.stream(rows).max().getAsInt() >= table.getRowCount() || col >= table.getColumnCount() ) {
return null; return null;
} }
Object[] tableValues = Arrays.stream(rows).mapToObj(c -> table.getModel().getValueAt(c, col)).toArray(); Object[] tableValues = Arrays.stream(rows).mapToObj(c -> table.getModel().getValueAt(c, col)).toArray();
List<FlightConfigurationId> Ids = new ArrayList<>(); List<FlightConfigurationId> Ids = new ArrayList<>();
for (Object tableValue : tableValues) { for (Object tableValue : tableValues) {
if (tableValue instanceof Pair) { if (tableValue instanceof Pair) {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
Pair<FlightConfigurationId, T> selectedComponent = (Pair<FlightConfigurationId, T>) tableValue; Pair<FlightConfigurationId, T> selectedComponent = (Pair<FlightConfigurationId, T>) tableValue;
FlightConfigurationId fcid = selectedComponent.getU(); FlightConfigurationId fcid = selectedComponent.getU();
Ids.add(fcid); Ids.add(fcid);
} else if (tableValue instanceof FlightConfigurationId) { } else if (tableValue instanceof FlightConfigurationId) {
Ids.add((FlightConfigurationId) tableValue); Ids.add((FlightConfigurationId) tableValue);
} else { } else {
Ids.add(FlightConfigurationId.ERROR_FCID); Ids.add(FlightConfigurationId.ERROR_FCID);
} }
} }
return Ids; return Ids;
} }
protected abstract class FlightConfigurableCellRenderer extends DefaultTableCellRenderer { protected abstract class FlightConfigurableCellRenderer extends DefaultTableCellRenderer {
@Override @Override
public Component getTableCellRendererComponent(JTable table, Object newValue, boolean isSelected, boolean hasFocus, int row, int column) { public Component getTableCellRendererComponent(JTable table, Object newValue, boolean isSelected, boolean hasFocus, int row, int column) {
JLabel label = (JLabel) super.getTableCellRendererComponent(table, newValue, isSelected, hasFocus, row, column); JLabel label = (JLabel) super.getTableCellRendererComponent(table, newValue, isSelected, hasFocus, row, column);
Object oldValue = table.getModel().getValueAt(row, column); Object oldValue = table.getModel().getValueAt(row, column);
// this block is more for the benefit of the reader than the computer -- // this block is more for the benefit of the reader than the computer --
// this assignment is technically redundant, but useful to point out that the new value here is often null, // this assignment is technically redundant, but useful to point out that the new value here is often null,
// while the old value seems to always be valid. // while the old value seems to always be valid.
if( null == newValue ){ if( null == newValue ){
log.warn("Detected null newValue to render... (oldValue: "+oldValue+")"); log.warn("Detected null newValue to render... (oldValue: "+oldValue+")");
newValue = oldValue; newValue = oldValue;
} }
column = table.convertColumnIndexToModel(column); column = table.convertColumnIndexToModel(column);
switch (column) { switch (column) {
case 0: { case 0: {
label.setText(descriptor.format(rocket, (FlightConfigurationId) oldValue)); label.setText(descriptor.format(rocket, (FlightConfigurationId) oldValue));
regular(label); regular(label);
setSelected(label, table, isSelected, hasFocus); setSelected(label, table, isSelected, hasFocus);
return label; return label;
} }
default: { default: {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
Pair<FlightConfigurationId, T> v = (Pair<FlightConfigurationId, T>) oldValue; Pair<FlightConfigurationId, T> v = (Pair<FlightConfigurationId, T>) oldValue;
if(v!=null){ if(v!=null){
FlightConfigurationId fcid = v.getU(); FlightConfigurationId fcid = v.getU();
T component = v.getV(); T component = v.getV();
label = format(component, fcid, label ); label = format(component, fcid, label );
} }
for (Component c : label.getComponents()) { for (Component c : label.getComponents()) {
if (c instanceof JLabel) { if (c instanceof JLabel) {
setSelected((JLabel)c, table, isSelected, hasFocus); setSelected((JLabel)c, table, isSelected, hasFocus);
} }
} }
setSelected(label, table, isSelected, hasFocus); setSelected(label, table, isSelected, hasFocus);
return label; return label;
} }
} }
} }
private final void setSelected( JComponent c, JTable table, boolean isSelected, boolean hasFocus ) { private final void setSelected( JComponent c, JTable table, boolean isSelected, boolean hasFocus ) {
c.setOpaque(true); c.setOpaque(true);
if ( isSelected) { if ( isSelected) {
c.setBackground(table.getSelectionBackground()); c.setBackground(table.getSelectionBackground());
c.setForeground((Color)UIManager.get("Table.selectionForeground")); c.setForeground((Color)UIManager.get("Table.selectionForeground"));
} else { } else {
c.setBackground(table.getBackground()); c.setBackground(table.getBackground());
c.setForeground(c.getForeground()); c.setForeground(c.getForeground());
} }
Border b = null; Border b = null;
if ( hasFocus ) { if ( hasFocus ) {
if (isSelected) { if (isSelected) {
b = UIManager.getBorder("Table.focusSelectedCellHighlightBorder"); b = UIManager.getBorder("Table.focusSelectedCellHighlightBorder");
} else { } else {
b = UIManager.getBorder("Table.focusCellHighligtBorder"); b = UIManager.getBorder("Table.focusCellHighligtBorder");
} }
} else { } else {
b = new EmptyBorder(1,1,1,1); b = new EmptyBorder(1,1,1,1);
} }
c.setBorder(b); c.setBorder(b);
} }
protected final void shaded(JLabel label) { protected final void shaded(JLabel label) {
GUIUtil.changeFontStyle(label, Font.ITALIC); GUIUtil.changeFontStyle(label, Font.ITALIC);
label.setForeground(Color.GRAY); label.setForeground(Color.GRAY);
} }
protected final void regular(JLabel label) { protected final void regular(JLabel label) {
GUIUtil.changeFontStyle(label, Font.PLAIN); GUIUtil.changeFontStyle(label, Font.PLAIN);
label.setForeground(Color.BLACK); label.setForeground(Color.BLACK);
} }
protected abstract JLabel format( T component, FlightConfigurationId configId, JLabel label ); protected abstract JLabel format( T component, FlightConfigurationId configId, JLabel label );
} }
} }

5
swing/src/net/sf/openrocket/gui/main/flightconfigpanel/MotorConfigurationPanel.java
View File

@ -33,6 +33,7 @@ import net.miginfocom.swing.MigLayout;
import net.sf.openrocket.gui.dialogs.flightconfiguration.IgnitionSelectionDialog; import net.sf.openrocket.gui.dialogs.flightconfiguration.IgnitionSelectionDialog;
import net.sf.openrocket.gui.dialogs.flightconfiguration.MotorMountConfigurationPanel; import net.sf.openrocket.gui.dialogs.flightconfiguration.MotorMountConfigurationPanel;
import net.sf.openrocket.gui.dialogs.motor.MotorChooserDialog; import net.sf.openrocket.gui.dialogs.motor.MotorChooserDialog;
import net.sf.openrocket.gui.main.FlightConfigurationPanel;
import net.sf.openrocket.gui.widgets.SelectColorButton; import net.sf.openrocket.gui.widgets.SelectColorButton;
import net.sf.openrocket.motor.IgnitionEvent; import net.sf.openrocket.motor.IgnitionEvent;
import net.sf.openrocket.motor.Motor; import net.sf.openrocket.motor.Motor;
@ -65,7 +66,7 @@ public class MotorConfigurationPanel extends FlightConfigurablePanel<MotorMount>
private final JPopupMenu popupMenuFull; // popup menu containing all the options private final JPopupMenu popupMenuFull; // popup menu containing all the options
MotorConfigurationPanel(final FlightConfigurationPanel flightConfigurationPanel, Rocket rocket) { public MotorConfigurationPanel(final FlightConfigurationPanel flightConfigurationPanel, Rocket rocket) {
super(flightConfigurationPanel, rocket); super(flightConfigurationPanel, rocket);
motorChooserDialog = new MotorChooserDialog(SwingUtilities.getWindowAncestor(flightConfigurationPanel)); motorChooserDialog = new MotorChooserDialog(SwingUtilities.getWindowAncestor(flightConfigurationPanel));
@ -294,7 +295,7 @@ public class MotorConfigurationPanel extends FlightConfigurablePanel<MotorMount>
flightConfigurationPanel.setSelectedComponents(components); flightConfigurationPanel.setSelectedComponents(components);
} }
protected void updateButtonState() { public void updateButtonState() {
if( configurationTableModel.getColumnCount() > 1 ) { if( configurationTableModel.getColumnCount() > 1 ) {
showContent(); showContent();

3
swing/src/net/sf/openrocket/gui/main/flightconfigpanel/RecoveryConfigurationPanel.java
View File

@ -25,6 +25,7 @@ import javax.swing.event.ListSelectionListener;
import net.sf.openrocket.formatting.RocketDescriptor; import net.sf.openrocket.formatting.RocketDescriptor;
import net.sf.openrocket.gui.dialogs.flightconfiguration.DeploymentSelectionDialog; import net.sf.openrocket.gui.dialogs.flightconfiguration.DeploymentSelectionDialog;
import net.sf.openrocket.gui.main.FlightConfigurationPanel;
import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.rocketcomponent.*; import net.sf.openrocket.rocketcomponent.*;
import net.sf.openrocket.rocketcomponent.DeploymentConfiguration.DeployEvent; import net.sf.openrocket.rocketcomponent.DeploymentConfiguration.DeployEvent;
@ -43,7 +44,7 @@ public class RecoveryConfigurationPanel extends FlightConfigurablePanel<Recovery
private final JPopupMenu popupMenuFull; // popup menu containing all the options private final JPopupMenu popupMenuFull; // popup menu containing all the options
RecoveryConfigurationPanel(FlightConfigurationPanel flightConfigurationPanel, Rocket rocket) { public RecoveryConfigurationPanel(FlightConfigurationPanel flightConfigurationPanel, Rocket rocket) {
super(flightConfigurationPanel,rocket); super(flightConfigurationPanel,rocket);
JScrollPane scroll = new JScrollPane(table); JScrollPane scroll = new JScrollPane(table);

3
swing/src/net/sf/openrocket/gui/main/flightconfigpanel/SeparationConfigurationPanel.java
View File

@ -25,6 +25,7 @@ import javax.swing.event.ListSelectionListener;
import net.sf.openrocket.formatting.RocketDescriptor; import net.sf.openrocket.formatting.RocketDescriptor;
import net.sf.openrocket.gui.dialogs.flightconfiguration.SeparationSelectionDialog; import net.sf.openrocket.gui.dialogs.flightconfiguration.SeparationSelectionDialog;
import net.sf.openrocket.gui.main.FlightConfigurationPanel;
import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.rocketcomponent.AxialStage; import net.sf.openrocket.rocketcomponent.AxialStage;
import net.sf.openrocket.rocketcomponent.ComponentChangeEvent; import net.sf.openrocket.rocketcomponent.ComponentChangeEvent;
@ -48,7 +49,7 @@ public class SeparationConfigurationPanel extends FlightConfigurablePanel<AxialS
private final JPopupMenu popupMenuFull; // popup menu containing all the options private final JPopupMenu popupMenuFull; // popup menu containing all the options
SeparationConfigurationPanel(FlightConfigurationPanel flightConfigurationPanel, Rocket rocket) { public SeparationConfigurationPanel(FlightConfigurationPanel flightConfigurationPanel, Rocket rocket) {
super(flightConfigurationPanel,rocket); super(flightConfigurationPanel,rocket);
JScrollPane scroll = new JScrollPane(table); JScrollPane scroll = new JScrollPane(table);