From 6cab407283b7e289842f3ae431d26286b7b51ce4 Mon Sep 17 00:00:00 2001 From: "nor..67" Date: Mon, 4 Apr 2011 15:56:04 +0000 Subject: [PATCH] - 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 --- .../nodes/actions/AbstractNewControlWizardAction.java | 4 ++-- .../nodes/actions/AbstractNewSpatialWizardAction.java | 4 ++-- .../sceneexplorer/nodes/actions/AbstractToolWizardAction.java | 2 +- .../src/com/jme3/gde/terraineditor/sky/AddSkyboxAction.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/AbstractNewControlWizardAction.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/AbstractNewControlWizardAction.java index 70be67de2..4435fcb02 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/AbstractNewControlWizardAction.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/AbstractNewControlWizardAction.java @@ -56,7 +56,7 @@ public abstract class AbstractNewControlWizardAction implements NewControlAction protected String name = "*"; 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); @@ -66,7 +66,7 @@ public abstract class AbstractNewControlWizardAction implements NewControlAction return new AbstractAction(name) { public void actionPerformed(ActionEvent e) { - final Object obj=showWizard(spatial); + final Object obj=showWizard(rootNode); SceneApplication.getApplication().enqueue(new Callable() { public Void call() throws Exception { diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/AbstractNewSpatialWizardAction.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/AbstractNewSpatialWizardAction.java index cbba90d9b..a0f1bbfb9 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/AbstractNewSpatialWizardAction.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/AbstractNewSpatialWizardAction.java @@ -56,7 +56,7 @@ public abstract class AbstractNewSpatialWizardAction implements NewSpatialAction protected String name = "*"; 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); @@ -66,7 +66,7 @@ public abstract class AbstractNewSpatialWizardAction implements NewSpatialAction return new AbstractAction(name) { public void actionPerformed(ActionEvent e) { - final Object obj = showWizard(node); + final Object obj = showWizard(rootNode); SceneApplication.getApplication().enqueue(new Callable() { public Void call() throws Exception { diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/AbstractToolWizardAction.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/AbstractToolWizardAction.java index 822f840b9..5b2b20435 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/AbstractToolWizardAction.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/AbstractToolWizardAction.java @@ -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); diff --git a/sdk/jme3-terrain-editor/src/com/jme3/gde/terraineditor/sky/AddSkyboxAction.java b/sdk/jme3-terrain-editor/src/com/jme3/gde/terraineditor/sky/AddSkyboxAction.java index e6c1b2120..459cd3417 100644 --- a/sdk/jme3-terrain-editor/src/com/jme3/gde/terraineditor/sky/AddSkyboxAction.java +++ b/sdk/jme3-terrain-editor/src/com/jme3/gde/terraineditor/sky/AddSkyboxAction.java @@ -32,7 +32,7 @@ public class AddSkyboxAction extends AbstractNewSpatialWizardAction { } @Override - protected Object showWizard(Spatial spatial) { + protected Object showWizard(org.openide.nodes.Node node) { WizardDescriptor wizardDescriptor = new WizardDescriptor(getPanels()); wizardDescriptor.setTitleFormat(new MessageFormat("{0}")); wizardDescriptor.setTitle("Skybox Wizard");