- change tool wizard actions to use AWT-safe org.openide.Node instead of spatial

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7183 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
3.0
nor..67 14 years ago
parent 33596cb88f
commit 6cab407283
  1. 4
      sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/AbstractNewControlWizardAction.java
  2. 4
      sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/AbstractNewSpatialWizardAction.java
  3. 2
      sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/AbstractToolWizardAction.java
  4. 2
      sdk/jme3-terrain-editor/src/com/jme3/gde/terraineditor/sky/AddSkyboxAction.java

@ -56,7 +56,7 @@ public abstract class AbstractNewControlWizardAction implements NewControlAction
protected String name = "*"; protected String name = "*";
protected ProjectAssetManager pm; protected ProjectAssetManager pm;
protected abstract Object showWizard(Spatial spatial); protected abstract Object showWizard(org.openide.nodes.Node node);
protected abstract Control doCreateControl(Spatial spatial, Object configuration); protected abstract Control doCreateControl(Spatial spatial, Object configuration);
@ -66,7 +66,7 @@ public abstract class AbstractNewControlWizardAction implements NewControlAction
return new AbstractAction(name) { return new AbstractAction(name) {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
final Object obj=showWizard(spatial); final Object obj=showWizard(rootNode);
SceneApplication.getApplication().enqueue(new Callable<Void>() { SceneApplication.getApplication().enqueue(new Callable<Void>() {
public Void call() throws Exception { public Void call() throws Exception {

@ -56,7 +56,7 @@ public abstract class AbstractNewSpatialWizardAction implements NewSpatialAction
protected String name = "*"; protected String name = "*";
protected ProjectAssetManager pm; protected ProjectAssetManager pm;
protected abstract Object showWizard(Spatial spatial); protected abstract Object showWizard(org.openide.nodes.Node node);
protected abstract Spatial doCreateSpatial(Node parent, Object configuration); protected abstract Spatial doCreateSpatial(Node parent, Object configuration);
@ -66,7 +66,7 @@ public abstract class AbstractNewSpatialWizardAction implements NewSpatialAction
return new AbstractAction(name) { return new AbstractAction(name) {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
final Object obj = showWizard(node); final Object obj = showWizard(rootNode);
SceneApplication.getApplication().enqueue(new Callable<Void>() { SceneApplication.getApplication().enqueue(new Callable<Void>() {
public Void call() throws Exception { public Void call() throws Exception {

@ -107,7 +107,7 @@ public abstract class AbstractToolWizardAction implements ToolAction {
}; };
} }
protected abstract Object showWizard(AbstractSceneExplorerNode rootNode); protected abstract Object showWizard(org.openide.nodes.Node node);
protected abstract Object doApplyTool(AbstractSceneExplorerNode rootNode, Object settings); protected abstract Object doApplyTool(AbstractSceneExplorerNode rootNode, Object settings);

@ -32,7 +32,7 @@ public class AddSkyboxAction extends AbstractNewSpatialWizardAction {
} }
@Override @Override
protected Object showWizard(Spatial spatial) { protected Object showWizard(org.openide.nodes.Node node) {
WizardDescriptor wizardDescriptor = new WizardDescriptor(getPanels()); WizardDescriptor wizardDescriptor = new WizardDescriptor(getPanels());
wizardDescriptor.setTitleFormat(new MessageFormat("{0}")); wizardDescriptor.setTitleFormat(new MessageFormat("{0}"));
wizardDescriptor.setTitle("Skybox Wizard"); wizardDescriptor.setTitle("Skybox Wizard");

Loading…
Cancel
Save