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

Merge pull request #1825 from SiboVG/issue-1819

Browse Source 
[#1819] Update simulation extensions after new extension creation
This commit is contained in:
Sibo Van Gool 2022-11-15 14:10:33 +01:00 committed by GitHub
commit b42acb5416
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 78 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/resources/l10n/messages.properties
View File

@ -470,6 +470,8 @@ SimulationExtension.javacode.name = Java code
SimulationExtension.javacode.name.none = none SimulationExtension.javacode.name.none = none
SimulationExtension.javacode.desc = Add a custom SimulationListener to the simulation SimulationExtension.javacode.desc = Add a custom SimulationListener to the simulation
SimulationExtension.javacode.className = Fully-qualified Java class name: SimulationExtension.javacode.className = Fully-qualified Java class name:
SimulationExtension.javacode.classnotfound = Could not find class
SimulationExtension.javacode.couldnotinstantiate = <html>Could not instantiate class %s.<br>Does it have a zero-argument, or @Inject constructor?</html>
SimulationExtension.scripting.name = {language} script SimulationExtension.scripting.name = {language} script
SimulationExtension.scripting.desc = Extend OpenRocket simulations by custom scripts. SimulationExtension.scripting.desc = Extend OpenRocket simulations by custom scripts.

11
core/src/net/sf/openrocket/simulation/extension/impl/JavaCode.java
View File

@ -1,5 +1,6 @@
package net.sf.openrocket.simulation.extension.impl; package net.sf.openrocket.simulation.extension.impl;
import com.google.inject.ConfigurationException;
import net.sf.openrocket.simulation.SimulationConditions; import net.sf.openrocket.simulation.SimulationConditions;
import net.sf.openrocket.simulation.exception.SimulationException; import net.sf.openrocket.simulation.exception.SimulationException;
import net.sf.openrocket.simulation.extension.AbstractSimulationExtension; import net.sf.openrocket.simulation.extension.AbstractSimulationExtension;
@ -23,11 +24,15 @@ public class JavaCode extends AbstractSimulationExtension {
if (!SimulationListener.class.isAssignableFrom(clazz)) { if (!SimulationListener.class.isAssignableFrom(clazz)) {
throw new SimulationException("Class " + className + " does not implement SimulationListener"); throw new SimulationException("Class " + className + " does not implement SimulationListener");
} }
SimulationListener listener = (SimulationListener) injector.getInstance(clazz); try {
conditions.getSimulationListenerList().add(listener); SimulationListener listener = (SimulationListener) injector.getInstance(clazz);
conditions.getSimulationListenerList().add(listener);
} catch (ConfigurationException e) {
throw new SimulationException(String.format(trans.get("SimulationExtension.javacode.couldnotinstantiate"), className), e);
}
} }
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {
throw new SimulationException("Could not find class " + className); throw new SimulationException(trans.get("SimulationExtension.javacode.classnotfound") + " " + className);
} }
} }

2
swing/src/net/sf/openrocket/gui/simulation/SimulationOptionsPanel.java
View File

@ -234,6 +234,7 @@ class SimulationOptionsPanel extends JPanel {
SwingSimulationExtensionConfigurator configurator = findConfigurator(e); SwingSimulationExtensionConfigurator configurator = findConfigurator(e);
if (configurator != null) { if (configurator != null) {
configurator.configure(e, simulation, SwingUtilities.windowForComponent(SimulationOptionsPanel.this)); configurator.configure(e, simulation, SwingUtilities.windowForComponent(SimulationOptionsPanel.this));
updateCurrentExtensions();
} }
} }
}); });
@ -257,6 +258,7 @@ class SimulationOptionsPanel extends JPanel {
SwingSimulationExtensionConfigurator configurator = findConfigurator(e); SwingSimulationExtensionConfigurator configurator = findConfigurator(e);
if (configurator != null) { if (configurator != null) {
configurator.configure(e, simulation, SwingUtilities.windowForComponent(SimulationOptionsPanel.this)); configurator.configure(e, simulation, SwingUtilities.windowForComponent(SimulationOptionsPanel.this));
updateCurrentExtensions();
} }
} }
}); });

22
swing/src/net/sf/openrocket/simulation/extension/AbstractSwingSimulationExtensionConfigurator.java
View File

@ -4,6 +4,8 @@ import java.awt.Dialog.ModalityType;
import java.awt.Window; import java.awt.Window;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import javax.swing.JButton; import javax.swing.JButton;
import javax.swing.JComponent; import javax.swing.JComponent;
@ -50,17 +52,21 @@ public abstract class AbstractSwingSimulationExtensionConfigurator<E extends Sim
close.addActionListener(new ActionListener() { close.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
dialog.setVisible(false); close();
} }
}); });
panel.add(close, "right"); panel.add(close, "right");
dialog.addWindowListener(new WindowAdapter() {
@Override
public void windowClosing(WindowEvent e) {
close();
}
});
dialog.add(panel); dialog.add(panel);
GUIUtil.setDisposableDialogOptions(dialog, close); GUIUtil.setDisposableDialogOptions(dialog, close);
dialog.setVisible(true); dialog.setVisible(true);
close();
GUIUtil.setNullModels(dialog);
dialog = null;
} }
/** /**
@ -78,10 +84,12 @@ public abstract class AbstractSwingSimulationExtensionConfigurator<E extends Sim
} }
/** /**
* Called when the default dialog is closed. By default does nothing. * Called when the default dialog is closed. By default hides the dialog and cleans up the component models.
*/ */
protected void close() { protected void close() {
dialog.setVisible(false);
GUIUtil.setNullModels(dialog);
dialog = null;
} }
protected abstract JComponent getConfigurationComponent(E extension, Simulation simulation, JPanel panel); protected abstract JComponent getConfigurationComponent(E extension, Simulation simulation, JPanel panel);

56
swing/src/net/sf/openrocket/simulation/extension/impl/JavaCodeConfigurator.java
View File

@ -8,22 +8,38 @@ import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener; import javax.swing.event.DocumentListener;
import net.sf.openrocket.document.Simulation; import net.sf.openrocket.document.Simulation;
import net.sf.openrocket.gui.components.StyledLabel;
import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.plugin.Plugin; import net.sf.openrocket.plugin.Plugin;
import net.sf.openrocket.simulation.extension.AbstractSwingSimulationExtensionConfigurator; import net.sf.openrocket.simulation.extension.AbstractSwingSimulationExtensionConfigurator;
import net.sf.openrocket.startup.Application;
import net.sf.openrocket.util.Color;
@Plugin @Plugin
public class JavaCodeConfigurator extends AbstractSwingSimulationExtensionConfigurator<JavaCode> { public class JavaCodeConfigurator extends AbstractSwingSimulationExtensionConfigurator<JavaCode> {
private JavaCode extension;
private JTextField classNameField;
private StyledLabel errorMsg;
private static final Translator trans = Application.getTranslator();
public JavaCodeConfigurator() { public JavaCodeConfigurator() {
super(JavaCode.class); super(JavaCode.class);
} }
@Override @Override
protected JComponent getConfigurationComponent(final JavaCode extension, Simulation simulation, JPanel panel) { protected JComponent getConfigurationComponent(final JavaCode extension, Simulation simulation, JPanel panel) {
this.extension = extension;
panel.add(new JLabel(trans.get("SimulationExtension.javacode.desc")), "wrap para"); panel.add(new JLabel(trans.get("SimulationExtension.javacode.desc")), "wrap para");
panel.add(new JLabel(trans.get("SimulationExtension.javacode.className")), "wrap rel"); panel.add(new JLabel(trans.get("SimulationExtension.javacode.className")), "wrap rel");
final JTextField textField = new JTextField(extension.getClassName()); classNameField = new JTextField(extension.getClassName());
textField.getDocument().addDocumentListener(new DocumentListener() { panel.add(classNameField, "growx, wrap");
this.errorMsg = new StyledLabel();
errorMsg.setFontColor(Color.DARK_RED.toAWTColor());
errorMsg.setVisible(false);
panel.add(errorMsg, "growx, wrap");
classNameField.getDocument().addDocumentListener(new DocumentListener() {
public void changedUpdate(DocumentEvent e) { public void changedUpdate(DocumentEvent e) {
update(); update();
} }
@ -37,11 +53,41 @@ public class JavaCodeConfigurator extends AbstractSwingSimulationExtensionConfig
} }
public void update() { public void update() {
extension.setClassName(textField.getText()); updateErrorMsg();
} }
}); });
panel.add(textField, "growx"); updateErrorMsg();
return panel; return panel;
} }
private void updateErrorMsg() {
if (this.errorMsg == null) {
return;
}
// Display error message if the class name is invalid
String text = classNameField.getText().trim();
try {
Class.forName(text);
errorMsg.setVisible(false);
} catch (ClassNotFoundException e) {
// Don't display an error message for an empty field
if (text.length() == 0) {
errorMsg.setVisible(false);
return;
}
errorMsg.setText(trans.get("SimulationExtension.javacode.classnotfound"));
errorMsg.setVisible(true);
}
}
@Override
protected void close() {
if (this.extension != null && this.classNameField != null) {
this.extension.setClassName(this.classNameField.getText().trim());
}
super.close();
}
} }