diff --git a/swing/resources/datafiles/examples/A staged rocket.ork b/swing/resources/datafiles/examples/A staged rocket.ork deleted file mode 100644 index 80cc2d7fb..000000000 Binary files a/swing/resources/datafiles/examples/A staged rocket.ork and /dev/null differ diff --git a/swing/resources/datafiles/examples/A three-stage rocket.ork b/swing/resources/datafiles/examples/A three-stage rocket.ork deleted file mode 100644 index 965ae133f..000000000 Binary files a/swing/resources/datafiles/examples/A three-stage rocket.ork and /dev/null differ diff --git a/swing/resources/datafiles/examples/A trial TARC payload rocket.ork b/swing/resources/datafiles/examples/A trial TARC payload rocket.ork deleted file mode 100644 index adf289c13..000000000 Binary files a/swing/resources/datafiles/examples/A trial TARC payload rocket.ork and /dev/null differ diff --git a/swing/resources/datafiles/examples/A tube fin rocket.ork b/swing/resources/datafiles/examples/A tube fin rocket.ork deleted file mode 100644 index 02fa73aee..000000000 Binary files a/swing/resources/datafiles/examples/A tube fin rocket.ork and /dev/null differ diff --git a/swing/resources/datafiles/examples/Airstart timing.ork b/swing/resources/datafiles/examples/Airstart timing.ork index 528d21ee7..5b58f5bdf 100644 Binary files a/swing/resources/datafiles/examples/Airstart timing.ork and b/swing/resources/datafiles/examples/Airstart timing.ork differ diff --git a/swing/resources/datafiles/examples/Chute release deployment.ork b/swing/resources/datafiles/examples/Chute release deployment.ork deleted file mode 100644 index 56db298dc..000000000 Binary files a/swing/resources/datafiles/examples/Chute release deployment.ork and /dev/null differ diff --git a/swing/resources/datafiles/examples/Chute release.ork b/swing/resources/datafiles/examples/Chute release.ork new file mode 100644 index 000000000..aa6705928 Binary files /dev/null and b/swing/resources/datafiles/examples/Chute release.ork differ diff --git a/swing/resources/datafiles/examples/Clustered motors.ork b/swing/resources/datafiles/examples/Clustered motors.ork new file mode 100644 index 000000000..16fdd59a5 Binary files /dev/null and b/swing/resources/datafiles/examples/Clustered motors.ork differ diff --git a/swing/resources/datafiles/examples/Dual parachute deployment.ork b/swing/resources/datafiles/examples/Dual parachute deployment.ork new file mode 100644 index 000000000..008270a8e Binary files /dev/null and b/swing/resources/datafiles/examples/Dual parachute deployment.ork differ diff --git a/swing/resources/datafiles/examples/Dual recovery deployment.ork b/swing/resources/datafiles/examples/Dual recovery deployment.ork deleted file mode 100644 index aa1f15db4..000000000 Binary files a/swing/resources/datafiles/examples/Dual recovery deployment.ork and /dev/null differ diff --git a/swing/resources/datafiles/examples/Motor cluster.ork b/swing/resources/datafiles/examples/Motor cluster.ork deleted file mode 100644 index 31c934de1..000000000 Binary files a/swing/resources/datafiles/examples/Motor cluster.ork and /dev/null differ diff --git a/swing/resources/datafiles/examples/Simulation extensions .ork b/swing/resources/datafiles/examples/Simulation extensions.ork similarity index 100% rename from swing/resources/datafiles/examples/Simulation extensions .ork rename to swing/resources/datafiles/examples/Simulation extensions.ork diff --git a/swing/resources/datafiles/examples/TARC payload rocket.ork b/swing/resources/datafiles/examples/TARC payload rocket.ork new file mode 100644 index 000000000..f209f2f0c Binary files /dev/null and b/swing/resources/datafiles/examples/TARC payload rocket.ork differ diff --git a/swing/resources/datafiles/examples/Three-stage rocket.ork b/swing/resources/datafiles/examples/Three-stage rocket.ork new file mode 100644 index 000000000..3d90fce6e Binary files /dev/null and b/swing/resources/datafiles/examples/Three-stage rocket.ork differ diff --git a/swing/resources/datafiles/examples/Tube fin rocket.ork b/swing/resources/datafiles/examples/Tube fin rocket.ork new file mode 100644 index 000000000..e6a56ba32 Binary files /dev/null and b/swing/resources/datafiles/examples/Tube fin rocket.ork differ diff --git a/swing/resources/datafiles/examples/Two-stage rocket.ork b/swing/resources/datafiles/examples/Two-stage rocket.ork new file mode 100644 index 000000000..8871b0e4c Binary files /dev/null and b/swing/resources/datafiles/examples/Two-stage rocket.ork differ diff --git a/swing/src/net/sf/openrocket/gui/main/ExampleDesignFileAction.java b/swing/src/net/sf/openrocket/gui/main/ExampleDesignFileAction.java index 6fc0f39a2..64abf6dc0 100644 --- a/swing/src/net/sf/openrocket/gui/main/ExampleDesignFileAction.java +++ b/swing/src/net/sf/openrocket/gui/main/ExampleDesignFileAction.java @@ -1,6 +1,8 @@ package net.sf.openrocket.gui.main; import java.awt.event.ActionEvent; +import java.util.ArrayList; +import java.util.List; import javax.swing.AbstractAction; import javax.swing.Action; @@ -18,6 +20,35 @@ public final class ExampleDesignFileAction extends JMenu { */ private final BasicFrame parent; + /** + * Order in which the example files should be displayed in the menu. + * A null items means there should be a separator. + *

+ * NOTE: update this list if you add a new example file, or update the name of an existing one!!. + */ + private static final String[] exampleFileOrder = { + // Examples of basic rockets + "A simple model rocket", + "Two-stage rocket", + "Three-stage rocket", + "TARC payload rocket", + "Tube fin rocket", + null, + // Examples demonstrating complex rocket features + "Airstart timing", + "Chute release", + "Dual parachute deployment", + "Clustered motors", + "Parallel booster staging", + "Pods--airframes and winglets", + "Pods--powered with recovery deployment", + null, + // Examples demonstrating customized functionality + "Presets", + "Simulation extensions", + "Simulation extensions and scripting" + }; + /** * Constructor. * @@ -38,11 +69,37 @@ public final class ExampleDesignFileAction extends JMenu { private void updateMenu() { removeAll(); ExampleDesignFile[] examples = ExampleDesignFile.getExampleDesigns(); + List itemList = new ArrayList<>(); + + // First create the menu items for (ExampleDesignFile file : examples) { Action action = createAction(file); action.putValue(Action.NAME, file.toString()); JMenuItem menuItem = new JMenuItem(action); - add(menuItem); + itemList.add(menuItem); + } + + // Then add them according to their order + for (String s : exampleFileOrder) { + if (s == null) { + addSeparator(); + } else { + for (JMenuItem item : itemList) { + if (item.getText().equals(s)) { + add(item); + itemList.remove(item); + break; + } + } + } + } + + // Add the remaining (unordered) items to the end + if (itemList.size() > 0) { + addSeparator(); + for (JMenuItem item : itemList) { + add(item); + } } }