From 0ff6cb8fc3abea48771b0a23b8f691826e5b35de Mon Sep 17 00:00:00 2001 From: "nor..67" Date: Fri, 18 Jan 2013 23:31:12 +0000 Subject: [PATCH] SDK: - cleanup imports and other small things in SDK-Core git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10103 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- sdk/jme3-core/src/com/jme3/gde/core/Installer.java | 2 -- .../gde/core/appstates/NewAppStateVisualPanel1.java | 1 - .../gde/core/appstates/NewAppStateWizardPanel1.java | 1 - .../src/com/jme3/gde/core/assets/AssetDataNode.java | 2 -- .../jme3/gde/core/assets/AssetsLookupProvider.java | 1 - .../jme3/gde/core/assets/BinaryModelFileLoader.java | 1 - .../com/jme3/gde/core/assets/ProjectAssetManager.java | 2 -- .../jme3/gde/core/assets/SpatialAssetDataObject.java | 5 +++++ .../jme3/gde/core/assets/actions/ConvertModel.java | 2 +- .../com/jme3/gde/core/assets/actions/OpenModel.java | 3 +-- .../src/com/jme3/gde/core/assets/nodes/AssetNode.java | 9 ++++++--- .../jme3/gde/core/assets/nodes/ProjectAssetsNode.java | 4 +++- .../com/jme3/gde/core/codeless/CodelessProject.java | 2 +- .../core/codeless/CodelessProjectWizardAction.java | 1 - .../codeless/CodelessProjectWizardWizardPanel1.java | 3 --- .../jme3/gde/core/editor/SceneEditorTopComponent.java | 4 +--- .../jme3/gde/core/editor/SpatialAssetOpenSupport.java | 8 -------- .../com/jme3/gde/core/filters/AbstractFilterNode.java | 1 - .../gde/core/filters/FilterExplorerTopComponent.java | 6 +++--- .../com/jme3/gde/core/filters/FilterIndexSupport.java | 1 - .../gde/core/filters/FilterPostProcessorNode.java | 2 +- .../com/jme3/gde/core/filters/OpenFilterAction.java | 7 +++---- .../gde/core/filters/actions/EnableFiterAction.java | 2 +- .../jme3/gde/core/filters/actions/NewFilterPopup.java | 1 - .../gde/core/filters/impl/JmeCartoonEdgeFilter.java | 1 - .../gde/core/filters/impl/JmeColorOverlayFilter.java | 1 - .../gde/core/filters/impl/JmeCrossHatchFilter.java | 1 - .../com/jme3/gde/core/filters/impl/JmeFXAAFilter.java | 1 - .../com/jme3/gde/core/filters/impl/JmeFogFilter.java | 1 - .../core/filters/impl/JmeLightScatteringFilter.java | 1 - .../com/jme3/gde/core/filters/impl/JmeSSAOFilter.java | 2 -- .../jme3/gde/core/filters/impl/JmeWaterFilter.java | 1 - .../gde/core/filters/impl/NewSSAOFilterAction.java | 1 - .../jme3/gde/core/j2seproject/J2seImportantFiles.java | 1 - sdk/jme3-core/src/com/jme3/gde/core/layer.xml | 4 ++++ .../com/jme3/gde/core/navigator/NavigatorNode.java | 1 - .../gde/core/properties/AudioDataPropertyEditor.java | 1 - .../gde/core/properties/AudioTrackPropertyEditor.java | 1 - .../properties/EffectTrackEmitterPropertyEditor.java | 1 - .../src/com/jme3/gde/core/scene/FakeApplication.java | 1 - .../src/com/jme3/gde/core/scene/OffScenePanel.java | 1 - .../src/com/jme3/gde/core/scene/SceneApplication.java | 3 +++ .../scene/controller/AbstractCameraController.java | 1 - .../core/scene/controller/SceneToolController.java | 2 +- .../core/sceneexplorer/MaterialChangeProvider.java | 1 - .../core/sceneexplorer/SceneExplorerTopComponent.java | 11 +++++------ .../nodes/AbstractSceneExplorerNode.java | 2 +- .../gde/core/sceneexplorer/nodes/JmeAmbientLight.java | 4 ++-- .../gde/core/sceneexplorer/nodes/JmeAnimControl.java | 1 + .../core/sceneexplorer/nodes/JmeAssetLinkNode.java | 6 ++++++ .../gde/core/sceneexplorer/nodes/JmeAudioNode.java | 4 +++- .../gde/core/sceneexplorer/nodes/JmeBitmapText.java | 4 +++- .../jme3/gde/core/sceneexplorer/nodes/JmeBone.java | 2 ++ .../core/sceneexplorer/nodes/JmeCharacterControl.java | 4 ++-- .../core/sceneexplorer/nodes/JmeDirectionalLight.java | 4 ++-- .../sceneexplorer/nodes/JmeDistanceLodCalculator.java | 2 -- .../core/sceneexplorer/nodes/JmeGenericControl.java | 4 ++-- .../gde/core/sceneexplorer/nodes/JmeGeometry.java | 2 +- .../gde/core/sceneexplorer/nodes/JmeGhostControl.java | 4 ++-- .../jme3/gde/core/sceneexplorer/nodes/JmeLight.java | 3 ++- .../jme3/gde/core/sceneexplorer/nodes/JmeMesh.java | 3 +-- .../jme3/gde/core/sceneexplorer/nodes/JmeNode.java | 7 ++++--- .../core/sceneexplorer/nodes/JmeParticleEmitter.java | 2 +- .../nodes/JmeParticleEmitterButtonProperty.java | 3 --- .../jme3/gde/core/sceneexplorer/nodes/JmePicture.java | 4 +++- .../gde/core/sceneexplorer/nodes/JmePointLight.java | 2 ++ .../core/sceneexplorer/nodes/JmeRigidBodyControl.java | 4 ++-- .../jme3/gde/core/sceneexplorer/nodes/JmeSpatial.java | 9 ++++----- .../gde/core/sceneexplorer/nodes/JmeSpotLight.java | 2 ++ .../gde/core/sceneexplorer/nodes/JmeTerrainGrid.java | 5 +++-- .../sceneexplorer/nodes/JmeTerrainLodControl.java | 1 - .../gde/core/sceneexplorer/nodes/JmeTerrainQuad.java | 4 +++- .../core/sceneexplorer/nodes/JmeVehicleControl.java | 7 +++++-- .../gde/core/sceneexplorer/nodes/JmeVehicleWheel.java | 3 +-- .../core/sceneexplorer/nodes/MeshGeometryPair.java | 1 - .../nodes/actions/AddUserDataAction.java | 2 +- .../sceneexplorer/nodes/actions/NewSpatialPopup.java | 2 +- .../core/sceneexplorer/nodes/actions/ToolPopup.java | 1 - .../nodes/actions/TrackVisibilityPopup.java | 2 -- .../sceneexplorer/nodes/actions/UserDataPicker.java | 4 ---- .../nodes/actions/impl/NewCharacterAction.java | 2 -- .../gde/core/sceneviewer/SceneViewerTopComponent.java | 10 ++++------ .../sceneviewer/actions/SwitchBackViewAction.java | 4 ++-- .../sceneviewer/actions/SwitchBottomViewAction.java | 4 ++-- .../sceneviewer/actions/SwitchFrontViewAction.java | 5 ++--- .../sceneviewer/actions/SwitchLeftViewAction.java | 4 ++-- .../sceneviewer/actions/SwitchRightViewAction.java | 4 ++-- .../core/sceneviewer/actions/SwitchTopViewAction.java | 4 ++-- .../sceneviewer/actions/ToggleOrthoPerspAction.java | 5 ++--- .../com/jme3/gde/core/util/ButtonInplaceEditor.java | 1 - .../com/jme3/gde/core/util/SliderInplaceEditor.java | 3 --- .../src/com/jme3/gde/core/util/ToggleButtonGroup.java | 5 +++++ 92 files changed, 124 insertions(+), 151 deletions(-) diff --git a/sdk/jme3-core/src/com/jme3/gde/core/Installer.java b/sdk/jme3-core/src/com/jme3/gde/core/Installer.java index a2c75edff..62f387a5c 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/Installer.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/Installer.java @@ -33,8 +33,6 @@ package com.jme3.gde.core; import com.jme3.gde.core.scene.SceneApplication; import java.io.File; -import java.lang.reflect.InvocationTargetException; -import java.util.prefs.BackingStoreException; import javax.swing.JPopupMenu; import org.netbeans.upgrade.AutoUpgrade; import org.openide.filesystems.FileChooserBuilder; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/appstates/NewAppStateVisualPanel1.java b/sdk/jme3-core/src/com/jme3/gde/core/appstates/NewAppStateVisualPanel1.java index e2f3726e9..14abed8c1 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/appstates/NewAppStateVisualPanel1.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/appstates/NewAppStateVisualPanel1.java @@ -31,7 +31,6 @@ */ package com.jme3.gde.core.appstates; -import com.jme3.gde.core.sceneexplorer.nodes.actions.impl.*; import java.util.HashSet; import java.util.Iterator; import java.util.LinkedList; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/appstates/NewAppStateWizardPanel1.java b/sdk/jme3-core/src/com/jme3/gde/core/appstates/NewAppStateWizardPanel1.java index d4798c83d..e7eac1c0f 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/appstates/NewAppStateWizardPanel1.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/appstates/NewAppStateWizardPanel1.java @@ -31,7 +31,6 @@ */ package com.jme3.gde.core.appstates; -import com.jme3.gde.core.sceneexplorer.nodes.actions.impl.*; import java.awt.Component; import javax.swing.event.ChangeListener; import org.netbeans.api.project.Project; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/assets/AssetDataNode.java b/sdk/jme3-core/src/com/jme3/gde/core/assets/AssetDataNode.java index e64a1e134..420bbc6e5 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/assets/AssetDataNode.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/assets/AssetDataNode.java @@ -35,8 +35,6 @@ import com.jme3.asset.AssetKey; import com.jme3.gde.core.util.PropertyUtils; import java.beans.PropertyDescriptor; import java.lang.reflect.Field; -import org.openide.DialogDisplayer; -import org.openide.NotifyDescriptor; import org.openide.loaders.DataNode; import org.openide.loaders.DataObject; import org.openide.nodes.Children; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/assets/AssetsLookupProvider.java b/sdk/jme3-core/src/com/jme3/gde/core/assets/AssetsLookupProvider.java index 5f6161feb..1728bc7ef 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/assets/AssetsLookupProvider.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/assets/AssetsLookupProvider.java @@ -32,7 +32,6 @@ package com.jme3.gde.core.assets; import com.jme3.gde.core.j2seproject.ProjectExtensionManager; -import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/assets/BinaryModelFileLoader.java b/sdk/jme3-core/src/com/jme3/gde/core/assets/BinaryModelFileLoader.java index 86bc016b9..09e7844d1 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/assets/BinaryModelFileLoader.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/assets/BinaryModelFileLoader.java @@ -34,7 +34,6 @@ package com.jme3.gde.core.assets; import java.io.IOException; import org.openide.filesystems.FileObject; import org.openide.filesystems.FileUtil; -import org.openide.loaders.DataObject; import org.openide.loaders.DataObjectExistsException; import org.openide.loaders.ExtensionList; import org.openide.loaders.FileEntry; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/assets/ProjectAssetManager.java b/sdk/jme3-core/src/com/jme3/gde/core/assets/ProjectAssetManager.java index 3f57733fb..2f922eea8 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/assets/ProjectAssetManager.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/assets/ProjectAssetManager.java @@ -44,11 +44,9 @@ import java.net.URLClassLoader; import java.util.ArrayList; import java.util.Collections; import java.util.Enumeration; -import java.util.HashSet; import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; import org.netbeans.api.java.classpath.ClassPath; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/assets/SpatialAssetDataObject.java b/sdk/jme3-core/src/com/jme3/gde/core/assets/SpatialAssetDataObject.java index 3e9fd965f..34d173341 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/assets/SpatialAssetDataObject.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/assets/SpatialAssetDataObject.java @@ -55,6 +55,10 @@ public class SpatialAssetDataObject extends AssetDataObject { public SpatialAssetDataObject(FileObject pf, MultiFileLoader loader) throws DataObjectExistsException, IOException { super(pf, loader); saveExtension = "j3o"; +// CookieSet cookies = getCookieSet(); +// cookies.add((Node.Cookie) new SpatialAssetOpenSupport(this)); +// cookies.assign(OpenCookie.class, new SpatialAssetOpenSupport(this)); +// cookies.assign(CloseCookie.class, new SpatialAssetCloseSupport(this)); } @Override @@ -102,6 +106,7 @@ public class SpatialAssetDataObject extends AssetDataObject { return null; } + @Override public synchronized void saveAsset() throws IOException { super.saveAsset(); ProjectAssetManager mgr = getLookup().lookup(ProjectAssetManager.class); diff --git a/sdk/jme3-core/src/com/jme3/gde/core/assets/actions/ConvertModel.java b/sdk/jme3-core/src/com/jme3/gde/core/assets/actions/ConvertModel.java index 23df3a0d5..bddfa5a28 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/assets/actions/ConvertModel.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/assets/actions/ConvertModel.java @@ -33,8 +33,8 @@ package com.jme3.gde.core.assets.actions; import com.jme3.gde.core.assets.BinaryModelDataObject; import com.jme3.gde.core.assets.SpatialAssetDataObject; -import java.awt.event.ActionListener; import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import java.util.List; import org.netbeans.api.progress.ProgressHandle; import org.netbeans.api.progress.ProgressHandleFactory; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/assets/actions/OpenModel.java b/sdk/jme3-core/src/com/jme3/gde/core/assets/actions/OpenModel.java index 47e8f0940..da1184d8a 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/assets/actions/OpenModel.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/assets/actions/OpenModel.java @@ -31,7 +31,6 @@ */ package com.jme3.gde.core.assets.actions; -import com.jme3.asset.DesktopAssetManager; import com.jme3.gde.core.assets.ProjectAssetManager; import com.jme3.gde.core.assets.SpatialAssetDataObject; import com.jme3.gde.core.scene.SceneApplication; @@ -40,8 +39,8 @@ import com.jme3.gde.core.sceneexplorer.nodes.JmeNode; import com.jme3.gde.core.sceneexplorer.nodes.NodeUtility; import com.jme3.scene.Node; import com.jme3.scene.Spatial; -import java.awt.event.ActionListener; import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import org.netbeans.api.progress.ProgressHandle; import org.netbeans.api.progress.ProgressHandleFactory; import org.openide.DialogDisplayer; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/assets/nodes/AssetNode.java b/sdk/jme3-core/src/com/jme3/gde/core/assets/nodes/AssetNode.java index 27719bd1b..a8d007530 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/assets/nodes/AssetNode.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/assets/nodes/AssetNode.java @@ -31,8 +31,8 @@ */ package com.jme3.gde.core.assets.nodes; -import com.jme3.gde.core.assets.ProjectAssetManager; import com.jme3.gde.core.assets.AssetDataObject; +import com.jme3.gde.core.assets.ProjectAssetManager; import org.openide.loaders.DataObject; import org.openide.nodes.FilterNode; import org.openide.nodes.Node; @@ -55,14 +55,17 @@ public class AssetNode extends FilterNode { } public static Lookup createLookupProxy(ProjectAssetManager manager, Node node) { - DataObject obj = node.getLookup().lookup(DataObject.class); + //TODO: This is causing the most silly exception for the most silly problem + // due to the most silly warning in netbeans platform + DataObject obj = null; + obj = node.getLookup().lookup(DataObject.class); if (obj instanceof AssetDataObject && obj.getLookup().lookup(ProjectAssetManager.class) == null) { ((AssetDataObject) obj).getLookupContents().add(manager); } return new ProxyLookup( new Lookup[]{ node.getLookup() - /*,Lookups.fixed(manager)*/ + /*,Lookups.fixed(manager)*/ }); } } diff --git a/sdk/jme3-core/src/com/jme3/gde/core/assets/nodes/ProjectAssetsNode.java b/sdk/jme3-core/src/com/jme3/gde/core/assets/nodes/ProjectAssetsNode.java index b3faa0811..df3a56173 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/assets/nodes/ProjectAssetsNode.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/assets/nodes/ProjectAssetsNode.java @@ -31,8 +31,8 @@ */ package com.jme3.gde.core.assets.nodes; -import com.jme3.gde.core.assets.ProjectAssetManager; import com.jme3.gde.core.assets.AssetDataObject; +import com.jme3.gde.core.assets.ProjectAssetManager; import java.awt.Image; import org.netbeans.api.project.Project; import org.openide.loaders.DataObject; @@ -78,10 +78,12 @@ public class ProjectAssetsNode extends FilterNode { }); } + @Override public Image getIcon(int type) { return smallImage; } + @Override public Image getOpenedIcon(int type) { return smallImage; } diff --git a/sdk/jme3-core/src/com/jme3/gde/core/codeless/CodelessProject.java b/sdk/jme3-core/src/com/jme3/gde/core/codeless/CodelessProject.java index 453b7ab05..98adf77d1 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/codeless/CodelessProject.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/codeless/CodelessProject.java @@ -14,8 +14,8 @@ import javax.swing.ImageIcon; import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectInformation; import org.netbeans.spi.project.ActionProvider; -import org.netbeans.spi.project.DeleteOperationImplementation; import org.netbeans.spi.project.CopyOperationImplementation; +import org.netbeans.spi.project.DeleteOperationImplementation; import org.netbeans.spi.project.ProjectState; import org.netbeans.spi.project.ui.LogicalViewProvider; import org.netbeans.spi.project.ui.support.DefaultProjectOperations; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/codeless/CodelessProjectWizardAction.java b/sdk/jme3-core/src/com/jme3/gde/core/codeless/CodelessProjectWizardAction.java index c8f859851..11a29e484 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/codeless/CodelessProjectWizardAction.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/codeless/CodelessProjectWizardAction.java @@ -31,7 +31,6 @@ */ package com.jme3.gde.core.codeless; -import com.jme3.gde.core.codeless.CodelessProjectFactory; import java.awt.Component; import java.awt.Dialog; import java.io.File; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/codeless/CodelessProjectWizardWizardPanel1.java b/sdk/jme3-core/src/com/jme3/gde/core/codeless/CodelessProjectWizardWizardPanel1.java index 0cca4f378..108e59f87 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/codeless/CodelessProjectWizardWizardPanel1.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/codeless/CodelessProjectWizardWizardPanel1.java @@ -31,12 +31,9 @@ */ package com.jme3.gde.core.codeless; -import java.awt.Component; import java.awt.event.ActionListener; -import java.io.File; import javax.swing.event.ChangeListener; import org.openide.WizardDescriptor; -import org.openide.awt.StatusDisplayer; import org.openide.util.HelpCtx; public class CodelessProjectWizardWizardPanel1 implements WizardDescriptor.Panel { diff --git a/sdk/jme3-core/src/com/jme3/gde/core/editor/SceneEditorTopComponent.java b/sdk/jme3-core/src/com/jme3/gde/core/editor/SceneEditorTopComponent.java index b99c66879..7e9b660c8 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/editor/SceneEditorTopComponent.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/editor/SceneEditorTopComponent.java @@ -5,16 +5,14 @@ import javax.swing.JPanel; import org.netbeans.api.settings.ConvertAsProperties; import org.openide.DialogDisplayer; import org.openide.NotifyDescriptor; -import org.openide.awt.ActionID; -import org.openide.awt.ActionReference; import org.openide.cookies.SaveCookie; import org.openide.loaders.DataObject; import org.openide.loaders.OpenSupport; import org.openide.nodes.Node; import org.openide.util.Exceptions; -import org.openide.windows.TopComponent; import org.openide.util.NbBundle.Messages; import org.openide.windows.CloneableTopComponent; +import org.openide.windows.TopComponent; /** * Top component which displays something. diff --git a/sdk/jme3-core/src/com/jme3/gde/core/editor/SpatialAssetOpenSupport.java b/sdk/jme3-core/src/com/jme3/gde/core/editor/SpatialAssetOpenSupport.java index 039185be0..35e140d2d 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/editor/SpatialAssetOpenSupport.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/editor/SpatialAssetOpenSupport.java @@ -12,7 +12,6 @@ import com.jme3.system.awt.AwtPanel; import java.util.concurrent.Callable; import org.openide.cookies.CloseCookie; import org.openide.cookies.OpenCookie; -import org.openide.loaders.Environment; import org.openide.loaders.OpenSupport; import org.openide.windows.CloneableTopComponent; @@ -44,11 +43,6 @@ public class SpatialAssetOpenSupport extends OpenSupport implements OpenCookie, if (app == null) { app = new SceneApplication(); tc.setDataObject(dataObject); -// dataObject.setModified(true); -// final ProgressHandle progressHandle = ProgressHandleFactory.createHandle("Opening Scene.."); -// progressHandle.start(); - //runs new thread, needed? - System.out.println("Judge Thread: " + Thread.currentThread().getName()); Thread t = new Thread(new Runnable() { public void run() { app.start(); @@ -81,7 +75,6 @@ public class SpatialAssetOpenSupport extends OpenSupport implements OpenCookie, @Override public boolean close() { - System.out.println("CLOSING"); boolean close = super.close(); if (close && app != null) { app.stop(); @@ -98,7 +91,6 @@ public class SpatialAssetOpenSupport extends OpenSupport implements OpenCookie, @Override protected boolean canClose() { - System.out.println("CANCLOSE"); return super.canClose(); } diff --git a/sdk/jme3-core/src/com/jme3/gde/core/filters/AbstractFilterNode.java b/sdk/jme3-core/src/com/jme3/gde/core/filters/AbstractFilterNode.java index e1e838c79..7002ee3e4 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/filters/AbstractFilterNode.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/filters/AbstractFilterNode.java @@ -36,7 +36,6 @@ import com.jme3.gde.core.properties.SceneExplorerProperty; import com.jme3.gde.core.properties.ScenePropertyChangeListener; import com.jme3.gde.core.util.PropertyUtils; import com.jme3.post.Filter; - import java.awt.Image; import java.beans.PropertyDescriptor; import java.io.IOException; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/filters/FilterExplorerTopComponent.java b/sdk/jme3-core/src/com/jme3/gde/core/filters/FilterExplorerTopComponent.java index 285461d46..ef4a7b867 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/filters/FilterExplorerTopComponent.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/filters/FilterExplorerTopComponent.java @@ -40,9 +40,6 @@ import java.util.concurrent.Callable; import java.util.logging.Level; import java.util.logging.Logger; import javax.swing.ActionMap; -import org.openide.util.NbBundle; -import org.openide.windows.TopComponent; -import org.openide.windows.WindowManager; import org.netbeans.api.settings.ConvertAsProperties; import org.openide.actions.MoveDownAction; import org.openide.actions.MoveUpAction; @@ -53,6 +50,9 @@ import org.openide.explorer.ExplorerUtils; import org.openide.explorer.view.BeanTreeView; import org.openide.nodes.Node; import org.openide.util.HelpCtx; +import org.openide.util.NbBundle; +import org.openide.windows.TopComponent; +import org.openide.windows.WindowManager; /** * Top component which displays something. diff --git a/sdk/jme3-core/src/com/jme3/gde/core/filters/FilterIndexSupport.java b/sdk/jme3-core/src/com/jme3/gde/core/filters/FilterIndexSupport.java index c707d514f..fdb1a3d02 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/filters/FilterIndexSupport.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/filters/FilterIndexSupport.java @@ -51,7 +51,6 @@ public class FilterIndexSupport extends Index.Support { Filter f = it.next(); filters.add(f); } - System.err.println("reordering"); fppNode.getFilterPostProcessor().removeAllFilters(); for (int i = 0; i < perm.length; i++) { fppNode.getFilterPostProcessor().addFilter(filters.get(perm[i])); diff --git a/sdk/jme3-core/src/com/jme3/gde/core/filters/FilterPostProcessorNode.java b/sdk/jme3-core/src/com/jme3/gde/core/filters/FilterPostProcessorNode.java index 105a6f821..82e098200 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/filters/FilterPostProcessorNode.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/filters/FilterPostProcessorNode.java @@ -31,8 +31,8 @@ */ package com.jme3.gde.core.filters; -import com.jme3.gde.core.filters.actions.NewFilterPopup; import com.jme3.gde.core.assets.FilterDataObject; +import com.jme3.gde.core.filters.actions.NewFilterPopup; import com.jme3.gde.core.scene.SceneApplication; import com.jme3.post.Filter; import com.jme3.post.FilterPostProcessor; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/filters/OpenFilterAction.java b/sdk/jme3-core/src/com/jme3/gde/core/filters/OpenFilterAction.java index 822a7de87..732c6b951 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/filters/OpenFilterAction.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/filters/OpenFilterAction.java @@ -32,13 +32,12 @@ package com.jme3.gde.core.filters; import com.jme3.gde.core.assets.FilterDataObject; -import java.awt.event.ActionListener; import java.awt.event.ActionEvent; - -import org.openide.awt.ActionRegistration; +import java.awt.event.ActionListener; +import org.openide.awt.ActionID; import org.openide.awt.ActionReference; import org.openide.awt.ActionReferences; -import org.openide.awt.ActionID; +import org.openide.awt.ActionRegistration; import org.openide.util.NbBundle.Messages; @ActionID(category = "Filters", diff --git a/sdk/jme3-core/src/com/jme3/gde/core/filters/actions/EnableFiterAction.java b/sdk/jme3-core/src/com/jme3/gde/core/filters/actions/EnableFiterAction.java index 59a152a2f..36abaa016 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/filters/actions/EnableFiterAction.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/filters/actions/EnableFiterAction.java @@ -38,8 +38,8 @@ package com.jme3.gde.core.filters.actions; import com.jme3.gde.core.filters.AbstractFilterNode; import com.jme3.gde.core.scene.SceneApplication; import com.jme3.post.Filter; -import java.awt.event.ActionListener; import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import java.util.concurrent.Callable; import java.util.logging.Logger; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/filters/actions/NewFilterPopup.java b/sdk/jme3-core/src/com/jme3/gde/core/filters/actions/NewFilterPopup.java index ed3f5f496..c1803cea5 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/filters/actions/NewFilterPopup.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/filters/actions/NewFilterPopup.java @@ -32,7 +32,6 @@ package com.jme3.gde.core.filters.actions; import com.jme3.gde.core.filters.FilterPostProcessorNode; -import com.jme3.gde.core.filters.actions.NewFilterAction; import com.jme3.gde.core.undoredo.AbstractUndoableSceneEdit; import com.jme3.gde.core.undoredo.SceneUndoRedoManager; import com.jme3.post.Filter; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/JmeCartoonEdgeFilter.java b/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/JmeCartoonEdgeFilter.java index ce1e80f92..7d88fc174 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/JmeCartoonEdgeFilter.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/JmeCartoonEdgeFilter.java @@ -33,7 +33,6 @@ package com.jme3.gde.core.filters.impl; import com.jme3.gde.core.filters.AbstractFilterNode; import com.jme3.gde.core.filters.FilterNode; -import com.jme3.math.ColorRGBA; import com.jme3.post.filters.CartoonEdgeFilter; import org.openide.loaders.DataObject; import org.openide.nodes.Node; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/JmeColorOverlayFilter.java b/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/JmeColorOverlayFilter.java index 9a21621b9..b8582e587 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/JmeColorOverlayFilter.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/JmeColorOverlayFilter.java @@ -33,7 +33,6 @@ package com.jme3.gde.core.filters.impl; import com.jme3.gde.core.filters.AbstractFilterNode; import com.jme3.gde.core.filters.FilterNode; -import com.jme3.math.ColorRGBA; import com.jme3.post.filters.ColorOverlayFilter; import org.openide.loaders.DataObject; import org.openide.nodes.Node; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/JmeCrossHatchFilter.java b/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/JmeCrossHatchFilter.java index 255fb5d2b..3ed9d4978 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/JmeCrossHatchFilter.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/JmeCrossHatchFilter.java @@ -33,7 +33,6 @@ package com.jme3.gde.core.filters.impl; import com.jme3.gde.core.filters.AbstractFilterNode; import com.jme3.gde.core.filters.FilterNode; -import com.jme3.math.ColorRGBA; import com.jme3.post.filters.CrossHatchFilter; import org.openide.loaders.DataObject; import org.openide.nodes.Node; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/JmeFXAAFilter.java b/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/JmeFXAAFilter.java index 996e2fefd..9dcc5c9f1 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/JmeFXAAFilter.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/JmeFXAAFilter.java @@ -34,7 +34,6 @@ package com.jme3.gde.core.filters.impl; import com.jme3.gde.core.filters.AbstractFilterNode; import com.jme3.gde.core.filters.FilterNode; import com.jme3.post.filters.FXAAFilter; -import com.jme3.post.ssao.SSAOFilter; import org.openide.loaders.DataObject; import org.openide.nodes.Node; import org.openide.nodes.Sheet; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/JmeFogFilter.java b/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/JmeFogFilter.java index 77b782d75..dd24f2a36 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/JmeFogFilter.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/JmeFogFilter.java @@ -33,7 +33,6 @@ package com.jme3.gde.core.filters.impl; import com.jme3.gde.core.filters.AbstractFilterNode; import com.jme3.gde.core.filters.FilterNode; -import com.jme3.math.ColorRGBA; import com.jme3.post.filters.FogFilter; import org.openide.loaders.DataObject; import org.openide.nodes.Node; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/JmeLightScatteringFilter.java b/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/JmeLightScatteringFilter.java index dae9fc097..3f9253f5e 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/JmeLightScatteringFilter.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/JmeLightScatteringFilter.java @@ -33,7 +33,6 @@ package com.jme3.gde.core.filters.impl; import com.jme3.gde.core.filters.AbstractFilterNode; import com.jme3.gde.core.filters.FilterNode; -import com.jme3.math.Vector3f; import com.jme3.post.filters.LightScatteringFilter; import org.openide.loaders.DataObject; import org.openide.nodes.Node; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/JmeSSAOFilter.java b/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/JmeSSAOFilter.java index 853f05840..3d5149833 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/JmeSSAOFilter.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/JmeSSAOFilter.java @@ -33,9 +33,7 @@ package com.jme3.gde.core.filters.impl; import com.jme3.gde.core.filters.AbstractFilterNode; import com.jme3.gde.core.filters.FilterNode; -import com.jme3.post.Filter; import com.jme3.post.ssao.SSAOFilter; -import com.jme3.water.WaterFilter; import org.openide.loaders.DataObject; import org.openide.nodes.Node; import org.openide.nodes.Sheet; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/JmeWaterFilter.java b/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/JmeWaterFilter.java index 4e6fd073a..7b01ee50d 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/JmeWaterFilter.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/JmeWaterFilter.java @@ -33,7 +33,6 @@ package com.jme3.gde.core.filters.impl; import com.jme3.gde.core.filters.AbstractFilterNode; import com.jme3.gde.core.filters.FilterNode; -import com.jme3.post.Filter; import com.jme3.water.WaterFilter; import org.openide.loaders.DataObject; import org.openide.nodes.Node; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/NewSSAOFilterAction.java b/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/NewSSAOFilterAction.java index 33756e296..3c1a80b6b 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/NewSSAOFilterAction.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/NewSSAOFilterAction.java @@ -35,7 +35,6 @@ import com.jme3.gde.core.filters.actions.AbstractNewFilterAction; import com.jme3.gde.core.filters.actions.NewFilterAction; import com.jme3.post.Filter; import com.jme3.post.ssao.SSAOFilter; -import com.jme3.water.WaterFilter; /** * diff --git a/sdk/jme3-core/src/com/jme3/gde/core/j2seproject/J2seImportantFiles.java b/sdk/jme3-core/src/com/jme3/gde/core/j2seproject/J2seImportantFiles.java index 04ff8a081..3f388f9c0 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/j2seproject/J2seImportantFiles.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/j2seproject/J2seImportantFiles.java @@ -5,7 +5,6 @@ package com.jme3.gde.core.j2seproject; import com.jme3.gde.core.importantfiles.ImportantFiles; -import java.util.ArrayList; import org.netbeans.api.project.Project; import org.openide.filesystems.FileObject; import org.openide.loaders.DataObject; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/layer.xml b/sdk/jme3-core/src/com/jme3/gde/core/layer.xml index 347519d82..6b2c02d9c 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/layer.xml +++ b/sdk/jme3-core/src/com/jme3/gde/core/layer.xml @@ -211,6 +211,10 @@ + diff --git a/sdk/jme3-core/src/com/jme3/gde/core/navigator/NavigatorNode.java b/sdk/jme3-core/src/com/jme3/gde/core/navigator/NavigatorNode.java index d0a15f0a7..56a6b28fc 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/navigator/NavigatorNode.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/navigator/NavigatorNode.java @@ -24,7 +24,6 @@ public class NavigatorNode extends AbstractNode{ @Override public void destroy() throws IOException { - System.out.println("call destroy"); super.destroy(); } diff --git a/sdk/jme3-core/src/com/jme3/gde/core/properties/AudioDataPropertyEditor.java b/sdk/jme3-core/src/com/jme3/gde/core/properties/AudioDataPropertyEditor.java index 55d7c1095..d2837fd8d 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/properties/AudioDataPropertyEditor.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/properties/AudioDataPropertyEditor.java @@ -31,7 +31,6 @@ */ package com.jme3.gde.core.properties; -import com.jme3.audio.AudioData; import com.jme3.gde.core.scene.SceneApplication; import com.jme3.gde.core.scene.SceneRequest; import java.awt.Component; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/properties/AudioTrackPropertyEditor.java b/sdk/jme3-core/src/com/jme3/gde/core/properties/AudioTrackPropertyEditor.java index 209066d72..0dbe6cb0f 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/properties/AudioTrackPropertyEditor.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/properties/AudioTrackPropertyEditor.java @@ -32,7 +32,6 @@ package com.jme3.gde.core.properties; import com.jme3.audio.AudioNode; -import com.jme3.effect.ParticleEmitter; import com.jme3.scene.Node; import com.jme3.scene.Spatial; import java.awt.Component; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/properties/EffectTrackEmitterPropertyEditor.java b/sdk/jme3-core/src/com/jme3/gde/core/properties/EffectTrackEmitterPropertyEditor.java index 9564ac648..efb2fc38f 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/properties/EffectTrackEmitterPropertyEditor.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/properties/EffectTrackEmitterPropertyEditor.java @@ -32,7 +32,6 @@ package com.jme3.gde.core.properties; import com.jme3.effect.ParticleEmitter; -import com.jme3.gde.core.sceneexplorer.nodes.JmeSpatial; import com.jme3.scene.Node; import com.jme3.scene.Spatial; import java.awt.Component; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/scene/FakeApplication.java b/sdk/jme3-core/src/com/jme3/gde/core/scene/FakeApplication.java index 290b34fcb..d00383389 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/scene/FakeApplication.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/scene/FakeApplication.java @@ -46,7 +46,6 @@ import com.jme3.renderer.RenderManager; import com.jme3.renderer.Renderer; import com.jme3.renderer.ViewPort; import com.jme3.scene.Node; -import com.jme3.scene.UserData; import com.jme3.scene.control.Control; import com.jme3.system.AppSettings; import com.jme3.system.JmeContext; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/scene/OffScenePanel.java b/sdk/jme3-core/src/com/jme3/gde/core/scene/OffScenePanel.java index 566c73e08..d77f15317 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/scene/OffScenePanel.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/scene/OffScenePanel.java @@ -37,7 +37,6 @@ */ package com.jme3.gde.core.scene; -import com.jme3.gde.core.sceneviewer.SceneViewerTopComponent; import com.jme3.light.PointLight; import com.jme3.math.ColorRGBA; import com.jme3.math.FastMath; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/scene/SceneApplication.java b/sdk/jme3-core/src/com/jme3/gde/core/scene/SceneApplication.java index ad8b175b6..8b406437e 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/scene/SceneApplication.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/scene/SceneApplication.java @@ -620,14 +620,17 @@ public class SceneApplication extends Application implements LookupProvider { } } + @Override public RenderManager getRenderManager() { return renderManager; } + @Override public ViewPort getViewPort() { return viewPort; } + @Override public ViewPort getGuiViewPort() { return guiViewPort; } diff --git a/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/AbstractCameraController.java b/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/AbstractCameraController.java index 9faed807c..8f56bcaa5 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/AbstractCameraController.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/AbstractCameraController.java @@ -128,7 +128,6 @@ public abstract class AbstractCameraController extends AbstractAppState implemen public void removeAdditionnalToolbar() { SceneViewerTopComponent svtc = SceneViewerTopComponent.findInstance(); - System.out.println("test remove" + svtc); if (svtc != null) { svtc.remove(CameraToolbar.getInstance()); } diff --git a/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/SceneToolController.java b/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/SceneToolController.java index 6b0ddf00f..bba62a46c 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/SceneToolController.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/SceneToolController.java @@ -12,8 +12,8 @@ import com.jme3.bounding.BoundingBox; import com.jme3.bounding.BoundingVolume; import com.jme3.bullet.collision.PhysicsCollisionObject; import com.jme3.bullet.control.CharacterControl; -import com.jme3.bullet.control.PhysicsControl; import com.jme3.bullet.control.GhostControl; +import com.jme3.bullet.control.PhysicsControl; import com.jme3.bullet.control.RigidBodyControl; import com.jme3.bullet.control.VehicleControl; import com.jme3.bullet.util.DebugShapeFactory; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/MaterialChangeProvider.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/MaterialChangeProvider.java index ab1aaf871..17b6d2748 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/MaterialChangeProvider.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/MaterialChangeProvider.java @@ -4,7 +4,6 @@ */ package com.jme3.gde.core.sceneexplorer; -import com.jme3.gde.core.sceneexplorer.MaterialChangeListener; import java.util.List; /** diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/SceneExplorerTopComponent.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/SceneExplorerTopComponent.java index 5d0d90834..2a1eac3ff 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/SceneExplorerTopComponent.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/SceneExplorerTopComponent.java @@ -47,11 +47,6 @@ import java.util.List; import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import org.openide.util.Exceptions; -import org.openide.util.NbBundle; -import org.openide.windows.TopComponent; -import org.openide.windows.WindowManager; -import org.openide.util.ImageUtilities; import org.netbeans.api.settings.ConvertAsProperties; import org.openide.actions.CopyAction; import org.openide.actions.CutAction; @@ -62,9 +57,14 @@ import org.openide.explorer.ExplorerManager; import org.openide.explorer.ExplorerUtils; import org.openide.explorer.view.BeanTreeView; import org.openide.nodes.Node; +import org.openide.util.Exceptions; import org.openide.util.HelpCtx; +import org.openide.util.ImageUtilities; import org.openide.util.Lookup; +import org.openide.util.NbBundle; import org.openide.util.actions.SystemAction; +import org.openide.windows.TopComponent; +import org.openide.windows.WindowManager; /** * Top component which displays something. @@ -327,7 +327,6 @@ public final class SceneExplorerTopComponent extends TopComponent implements Exp public void removeMaterialChangeProvider(MaterialChangeProvider provider) { Logger.getLogger(SceneExplorerTopComponent.class.getName()).log(Level.INFO, "Removing material provider for : {0}", provider.getKey()); - System.out.println("Removing provider : " + provider.getKey()); materialChangeProviders.remove(provider.getKey()); } diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/AbstractSceneExplorerNode.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/AbstractSceneExplorerNode.java index 61b450213..649b4f63c 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/AbstractSceneExplorerNode.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/AbstractSceneExplorerNode.java @@ -201,7 +201,7 @@ public abstract class AbstractSceneExplorerNode extends AbstractNode implements } public void syncSceneData() { - //TODO: precache structure to avoid locks? + //TODO: precache structure to avoid locks? Do it backwards, sending the actual bean value? for (PropertySet propertySet : getPropertySets()) { for (Property property : propertySet.getProperties()) { if(property instanceof SceneExplorerProperty){ diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeAmbientLight.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeAmbientLight.java index 4cabff7b9..107c33f5f 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeAmbientLight.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeAmbientLight.java @@ -32,9 +32,7 @@ package com.jme3.gde.core.sceneexplorer.nodes; -import com.jme3.gde.core.sceneexplorer.nodes.SceneExplorerNode; import com.jme3.light.AmbientLight; -import com.jme3.math.Vector3f; import com.jme3.scene.Spatial; import org.openide.cookies.SaveCookie; import org.openide.loaders.DataObject; @@ -75,10 +73,12 @@ public class JmeAmbientLight extends JmeLight{ } + @Override public Class getExplorerObjectClass() { return AmbientLight.class; } + @Override public Class getExplorerNodeClass() { return JmeAmbientLight.class; } diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeAnimControl.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeAnimControl.java index 760366cb7..6948ca325 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeAnimControl.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeAnimControl.java @@ -158,6 +158,7 @@ public class JmeAnimControl extends AbstractSceneExplorerNode { return AnimControl.class; } + @Override public Class getExplorerNodeClass() { return JmeAnimControl.class; } diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeAssetLinkNode.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeAssetLinkNode.java index 6ec09184b..efd2558a3 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeAssetLinkNode.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeAssetLinkNode.java @@ -126,14 +126,17 @@ public class JmeAssetLinkNode extends JmeNode { } } + @Override public Class getExplorerObjectClass() { return AssetLinkNode.class; } + @Override public Class getExplorerNodeClass() { return JmeAssetLinkNode.class; } + @Override public org.openide.nodes.Node[] createNodes(Object key, DataObject key2, boolean cookie) { JmeSpatialChildren children = new JmeSpatialChildren((com.jme3.scene.Spatial) key); children.setReadOnly(cookie); @@ -147,11 +150,13 @@ public class JmeAssetLinkNode extends JmeNode { super(spatial); } + @Override public void refreshChildren(boolean immediate) { setKeys(createKeys()); refresh(); } + @Override protected List createKeys() { try { return SceneApplication.getApplication().enqueue(new Callable>() { @@ -173,6 +178,7 @@ public class JmeAssetLinkNode extends JmeNode { return null; } + @Override public void setReadOnly(boolean cookie) { this.readOnly = cookie; } diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeAudioNode.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeAudioNode.java index 3b9b4db3c..fe7810a0a 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeAudioNode.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeAudioNode.java @@ -34,7 +34,6 @@ package com.jme3.gde.core.sceneexplorer.nodes; import com.jme3.audio.AudioNode; import com.jme3.audio.AudioNode.Status; import com.jme3.audio.Filter; -import com.jme3.gde.core.sceneexplorer.nodes.SceneExplorerNode; import com.jme3.gde.core.properties.AudioDataProperty; import com.jme3.math.Vector3f; import java.awt.Image; @@ -111,14 +110,17 @@ public class JmeAudioNode extends JmeNode { } + @Override public Class getExplorerObjectClass() { return AudioNode.class; } + @Override public Class getExplorerNodeClass() { return JmeAudioNode.class; } + @Override public org.openide.nodes.Node[] createNodes(Object key, DataObject key2, boolean cookie) { JmeSpatialChildren children=new JmeSpatialChildren((com.jme3.scene.Spatial)key); children.setReadOnly(cookie); diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeBitmapText.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeBitmapText.java index 4b4d903d5..e1fcc4cbc 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeBitmapText.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeBitmapText.java @@ -33,7 +33,6 @@ package com.jme3.gde.core.sceneexplorer.nodes; import com.jme3.font.BitmapFont; import com.jme3.font.BitmapText; -import com.jme3.gde.core.sceneexplorer.nodes.SceneExplorerNode; import com.jme3.math.ColorRGBA; import java.awt.Image; import org.openide.loaders.DataObject; @@ -92,14 +91,17 @@ public class JmeBitmapText extends JmeNode { } + @Override public Class getExplorerObjectClass() { return BitmapText.class; } + @Override public Class getExplorerNodeClass() { return JmeBitmapText.class; } + @Override public org.openide.nodes.Node[] createNodes(Object key, DataObject key2, boolean cookie) { JmeSpatialChildren children=new JmeSpatialChildren((com.jme3.scene.Spatial)key); children.setReadOnly(cookie); diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeBone.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeBone.java index 63656b27a..b70d84080 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeBone.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeBone.java @@ -131,10 +131,12 @@ public class JmeBone extends AbstractSceneExplorerNode { return Bone.class; } + @Override public Class getExplorerNodeClass() { return JmeBone.class; } + @Override public org.openide.nodes.Node[] createNodes(Object key, DataObject key2, boolean cookie) { JmeBoneChildren children = new JmeBoneChildren(jmeSkeletonControl, (Bone) key); children.setReadOnly(cookie); diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeCharacterControl.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeCharacterControl.java index e243509c3..964072268 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeCharacterControl.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeCharacterControl.java @@ -34,8 +34,6 @@ package com.jme3.gde.core.sceneexplorer.nodes; import com.jme3.bullet.collision.shapes.CollisionShape; import com.jme3.bullet.control.CharacterControl; import com.jme3.gde.core.scene.SceneApplication; -import com.jme3.gde.core.sceneexplorer.nodes.AbstractSceneExplorerNode; -import com.jme3.gde.core.sceneexplorer.nodes.SceneExplorerNode; import com.jme3.math.Vector3f; import com.jme3.scene.Spatial; import java.awt.Image; @@ -149,10 +147,12 @@ public class JmeCharacterControl extends AbstractSceneExplorerNode { return CharacterControl.class; } + @Override public Class getExplorerNodeClass() { return JmeCharacterControl.class; } + @Override public org.openide.nodes.Node[] createNodes(Object key, DataObject key2, boolean cookie) { return new org.openide.nodes.Node[]{new JmeCharacterControl((CharacterControl) key, key2).setReadOnly(cookie)}; } diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeDirectionalLight.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeDirectionalLight.java index a1315a33f..8b24f69b7 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeDirectionalLight.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeDirectionalLight.java @@ -32,11 +32,9 @@ package com.jme3.gde.core.sceneexplorer.nodes; -import com.jme3.gde.core.sceneexplorer.nodes.SceneExplorerNode; import com.jme3.light.DirectionalLight; import com.jme3.math.Vector3f; import com.jme3.scene.Spatial; -import org.openide.cookies.SaveCookie; import org.openide.nodes.Sheet; /** @@ -76,10 +74,12 @@ public class JmeDirectionalLight extends JmeLight{ } + @Override public Class getExplorerObjectClass() { return DirectionalLight.class; } + @Override public Class getExplorerNodeClass() { return JmeDirectionalLight.class; } diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeDistanceLodCalculator.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeDistanceLodCalculator.java index 5364253d0..36fa8109e 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeDistanceLodCalculator.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeDistanceLodCalculator.java @@ -34,13 +34,11 @@ package com.jme3.gde.core.sceneexplorer.nodes; import com.jme3.gde.core.scene.SceneApplication; import com.jme3.terrain.geomipmap.TerrainLodControl; import com.jme3.terrain.geomipmap.lodcalc.DistanceLodCalculator; - import java.awt.Image; import java.io.IOException; import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; import javax.swing.Action; -import org.openide.actions.DeleteAction; import org.openide.loaders.DataObject; import org.openide.nodes.Children; import org.openide.nodes.Sheet; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeGenericControl.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeGenericControl.java index 985c5f0d6..5790f3228 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeGenericControl.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeGenericControl.java @@ -31,10 +31,10 @@ */ package com.jme3.gde.core.sceneexplorer.nodes; -import com.jme3.gde.core.util.DynamicLookup; -import com.jme3.gde.core.scene.SceneApplication; import com.jme3.gde.core.properties.SceneExplorerProperty; import com.jme3.gde.core.properties.ScenePropertyChangeListener; +import com.jme3.gde.core.scene.SceneApplication; +import com.jme3.gde.core.util.DynamicLookup; import com.jme3.gde.core.util.PropertyUtils; import com.jme3.scene.Spatial; import com.jme3.scene.control.Control; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeGeometry.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeGeometry.java index 3a38a8155..bcb360d50 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeGeometry.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeGeometry.java @@ -32,8 +32,8 @@ package com.jme3.gde.core.sceneexplorer.nodes; import com.jme3.gde.core.scene.SceneApplication; -import com.jme3.gde.core.sceneexplorer.SceneExplorerTopComponent; import com.jme3.gde.core.sceneexplorer.MaterialChangeListener; +import com.jme3.gde.core.sceneexplorer.SceneExplorerTopComponent; import com.jme3.material.Material; import com.jme3.scene.Geometry; import com.jme3.scene.Mesh; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeGhostControl.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeGhostControl.java index c1bfbd7da..162a18fc2 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeGhostControl.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeGhostControl.java @@ -34,8 +34,6 @@ package com.jme3.gde.core.sceneexplorer.nodes; import com.jme3.bullet.collision.shapes.CollisionShape; import com.jme3.bullet.control.GhostControl; import com.jme3.gde.core.scene.SceneApplication; -import com.jme3.gde.core.sceneexplorer.nodes.AbstractSceneExplorerNode; -import com.jme3.gde.core.sceneexplorer.nodes.SceneExplorerNode; import com.jme3.math.Quaternion; import com.jme3.math.Vector3f; import com.jme3.scene.Spatial; @@ -145,10 +143,12 @@ public class JmeGhostControl extends AbstractSceneExplorerNode { return GhostControl.class; } + @Override public Class getExplorerNodeClass() { return JmeGhostControl.class; } + @Override public org.openide.nodes.Node[] createNodes(Object key, DataObject key2, boolean cookie) { return new org.openide.nodes.Node[]{new JmeGhostControl((GhostControl) key, key2).setReadOnly(cookie)}; } diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeLight.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeLight.java index a206809ca..d4e253ff7 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeLight.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeLight.java @@ -41,7 +41,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; import javax.swing.Action; import org.openide.actions.DeleteAction; -import org.openide.loaders.DataObject; import org.openide.nodes.Children; import org.openide.nodes.Node; import org.openide.nodes.Sheet; @@ -73,6 +72,7 @@ public class JmeLight extends AbstractSceneExplorerNode { setName("Light"); } + @Override protected void fireSave(boolean modified) { Node parent = getParentNode(); if (parent instanceof AbstractSceneExplorerNode) { @@ -154,6 +154,7 @@ public class JmeLight extends AbstractSceneExplorerNode { return Light.class; } + @Override public Class getExplorerNodeClass() { return JmeLight.class; } diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeMesh.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeMesh.java index 3055de7a5..61ec36eb7 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeMesh.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeMesh.java @@ -32,8 +32,6 @@ package com.jme3.gde.core.sceneexplorer.nodes; import com.jme3.gde.core.scene.SceneApplication; -import com.jme3.gde.core.sceneexplorer.nodes.AbstractSceneExplorerNode; -import com.jme3.gde.core.sceneexplorer.nodes.SceneExplorerNode; import com.jme3.light.Light; import com.jme3.scene.Geometry; import com.jme3.scene.Mesh; @@ -142,6 +140,7 @@ public class JmeMesh extends AbstractSceneExplorerNode{ return Mesh.class; } + @Override public Class getExplorerNodeClass() { return JmeMesh.class; } diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeNode.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeNode.java index 5f1c638ac..6e399a78e 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeNode.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeNode.java @@ -32,12 +32,10 @@ package com.jme3.gde.core.sceneexplorer.nodes; import com.jme3.gde.core.scene.SceneApplication; -import com.jme3.gde.core.sceneexplorer.nodes.ClipboardSpatial; -import com.jme3.gde.core.sceneexplorer.nodes.SceneExplorerNode; +import com.jme3.gde.core.sceneexplorer.nodes.actions.AddUserDataAction; import com.jme3.gde.core.sceneexplorer.nodes.actions.NewControlPopup; import com.jme3.gde.core.sceneexplorer.nodes.actions.NewLightPopup; import com.jme3.gde.core.sceneexplorer.nodes.actions.NewSpatialPopup; -import com.jme3.gde.core.sceneexplorer.nodes.actions.AddUserDataAction; import com.jme3.gde.core.sceneexplorer.nodes.actions.ToolPopup; import com.jme3.scene.Node; import com.jme3.scene.Spatial; @@ -179,14 +177,17 @@ public class JmeNode extends JmeSpatial { } } + @Override public Class getExplorerObjectClass() { return Node.class; } + @Override public Class getExplorerNodeClass() { return JmeNode.class; } + @Override public org.openide.nodes.Node[] createNodes(Object key, DataObject key2, boolean cookie) { JmeSpatialChildren children = new JmeSpatialChildren((com.jme3.scene.Spatial) key); children.setReadOnly(cookie); diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeParticleEmitter.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeParticleEmitter.java index c91fd43bd..0414bb6b1 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeParticleEmitter.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeParticleEmitter.java @@ -31,11 +31,11 @@ */ package com.jme3.gde.core.sceneexplorer.nodes; -import com.jme3.effect.shapes.EmitterShape; import com.jme3.effect.ParticleEmitter; import com.jme3.effect.ParticleMesh; import com.jme3.effect.influencers.DefaultParticleInfluencer; import com.jme3.effect.influencers.ParticleInfluencer; +import com.jme3.effect.shapes.EmitterShape; import com.jme3.gde.core.assets.ProjectAssetManager; import com.jme3.gde.core.properties.ParticleInfluencerProperty; import com.jme3.gde.core.util.PropertyUtils; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeParticleEmitterButtonProperty.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeParticleEmitterButtonProperty.java index 60a0e8601..b9c725d14 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeParticleEmitterButtonProperty.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeParticleEmitterButtonProperty.java @@ -1,10 +1,7 @@ package com.jme3.gde.core.sceneexplorer.nodes; -import com.jme3.effect.ParticleEmitter; import com.jme3.gde.core.scene.SceneApplication; import com.jme3.gde.core.util.ButtonInplaceEditor; -import java.awt.Color; -import java.awt.Font; import java.awt.Graphics; import java.awt.Rectangle; import java.awt.event.ActionEvent; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmePicture.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmePicture.java index f433b18af..1f50c91a4 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmePicture.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmePicture.java @@ -31,7 +31,6 @@ */ package com.jme3.gde.core.sceneexplorer.nodes; -import com.jme3.gde.core.sceneexplorer.nodes.SceneExplorerNode; import com.jme3.ui.Picture; import java.awt.Image; import org.openide.loaders.DataObject; @@ -87,14 +86,17 @@ public class JmePicture extends JmeGeometry { } + @Override public Class getExplorerObjectClass() { return Picture.class; } + @Override public Class getExplorerNodeClass() { return JmePicture.class; } + @Override public org.openide.nodes.Node[] createNodes(Object key, DataObject key2, boolean cookie) { JmeSpatialChildren children=new JmeSpatialChildren((com.jme3.scene.Spatial)key); children.setReadOnly(cookie); diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmePointLight.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmePointLight.java index 398f91ab0..f2a72b7ce 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmePointLight.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmePointLight.java @@ -75,10 +75,12 @@ public class JmePointLight extends JmeLight{ } + @Override public Class getExplorerObjectClass() { return PointLight.class; } + @Override public Class getExplorerNodeClass() { return JmePointLight.class; } diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeRigidBodyControl.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeRigidBodyControl.java index 46fed8703..16e830e12 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeRigidBodyControl.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeRigidBodyControl.java @@ -34,8 +34,6 @@ package com.jme3.gde.core.sceneexplorer.nodes; import com.jme3.bullet.collision.shapes.CollisionShape; import com.jme3.bullet.control.RigidBodyControl; import com.jme3.gde.core.scene.SceneApplication; -import com.jme3.gde.core.sceneexplorer.nodes.AbstractSceneExplorerNode; -import com.jme3.gde.core.sceneexplorer.nodes.SceneExplorerNode; import com.jme3.math.Quaternion; import com.jme3.math.Vector3f; import com.jme3.scene.Spatial; @@ -156,10 +154,12 @@ public class JmeRigidBodyControl extends AbstractSceneExplorerNode { return RigidBodyControl.class; } + @Override public Class getExplorerNodeClass() { return JmeRigidBodyControl.class; } + @Override public org.openide.nodes.Node[] createNodes(Object key, DataObject key2, boolean cookie) { return new org.openide.nodes.Node[]{new JmeRigidBodyControl((RigidBodyControl) key, key2).setReadOnly(cookie)}; } diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeSpatial.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeSpatial.java index a2b920677..965b19b8e 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeSpatial.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeSpatial.java @@ -33,15 +33,12 @@ package com.jme3.gde.core.sceneexplorer.nodes; import com.jme3.bounding.BoundingVolume; import com.jme3.export.binary.BinaryExporter; +import com.jme3.gde.core.properties.UserDataProperty; import com.jme3.gde.core.scene.SceneApplication; -import com.jme3.gde.core.sceneexplorer.nodes.AbstractSceneExplorerNode; -import com.jme3.gde.core.sceneexplorer.nodes.ClipboardSpatial; -import com.jme3.gde.core.sceneexplorer.nodes.SceneExplorerNode; +import com.jme3.gde.core.sceneexplorer.nodes.actions.AddUserDataAction; import com.jme3.gde.core.sceneexplorer.nodes.actions.NewControlPopup; import com.jme3.gde.core.sceneexplorer.nodes.actions.NewLightPopup; -import com.jme3.gde.core.sceneexplorer.nodes.actions.AddUserDataAction; import com.jme3.gde.core.sceneexplorer.nodes.actions.ToolPopup; -import com.jme3.gde.core.properties.UserDataProperty; import com.jme3.light.LightList; import com.jme3.math.Quaternion; import com.jme3.math.Vector3f; @@ -350,10 +347,12 @@ public class JmeSpatial extends AbstractSceneExplorerNode { return Spatial.class; } + @Override public Class getExplorerNodeClass() { return JmeSpatial.class; } + @Override public Node[] createNodes(Object key, DataObject key2, boolean cookie) { JmeSpatialChildren children = new JmeSpatialChildren((com.jme3.scene.Spatial) key); children.setReadOnly(cookie); diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeSpotLight.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeSpotLight.java index 8e7dc65b1..2d0d486f7 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeSpotLight.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeSpotLight.java @@ -76,10 +76,12 @@ public class JmeSpotLight extends JmeLight{ } + @Override public Class getExplorerObjectClass() { return SpotLight.class; } + @Override public Class getExplorerNodeClass() { return JmeSpotLight.class; } diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeTerrainGrid.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeTerrainGrid.java index 850e17128..667d6d70f 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeTerrainGrid.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeTerrainGrid.java @@ -31,13 +31,11 @@ */ package com.jme3.gde.core.sceneexplorer.nodes; -import com.jme3.gde.core.scene.SceneApplication; import com.jme3.math.Vector3f; import com.jme3.terrain.geomipmap.TerrainGrid; import com.jme3.terrain.geomipmap.TerrainGridListener; import com.jme3.terrain.geomipmap.TerrainQuad; import java.awt.Image; -import java.util.concurrent.Callable; import java.util.logging.Level; import java.util.logging.Logger; import org.openide.loaders.DataObject; @@ -94,14 +92,17 @@ public class JmeTerrainGrid extends JmeTerrainQuad implements TerrainGridListene } + @Override public Class getExplorerObjectClass() { return TerrainGrid.class; } + @Override public Class getExplorerNodeClass() { return JmeTerrainGrid.class; } + @Override public org.openide.nodes.Node[] createNodes(Object key, DataObject key2, boolean cookie) { JmeSpatialChildren children = new JmeSpatialChildren((com.jme3.scene.Spatial) key); children.setReadOnly(cookie); diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeTerrainLodControl.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeTerrainLodControl.java index f20905ef9..b8e457bb1 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeTerrainLodControl.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeTerrainLodControl.java @@ -44,7 +44,6 @@ import java.util.List; import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; import javax.swing.Action; -import org.openide.actions.DeleteAction; import org.openide.loaders.DataObject; import org.openide.nodes.Children; import org.openide.nodes.Node; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeTerrainQuad.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeTerrainQuad.java index 94ca3d928..112305c66 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeTerrainQuad.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeTerrainQuad.java @@ -31,7 +31,6 @@ */ package com.jme3.gde.core.sceneexplorer.nodes; -import com.jme3.gde.core.sceneexplorer.nodes.SceneExplorerNode; import com.jme3.terrain.geomipmap.TerrainQuad; import java.awt.Image; import org.openide.loaders.DataObject; @@ -88,14 +87,17 @@ public class JmeTerrainQuad extends JmeNode { } + @Override public Class getExplorerObjectClass() { return TerrainQuad.class; } + @Override public Class getExplorerNodeClass() { return JmeTerrainQuad.class; } + @Override public org.openide.nodes.Node[] createNodes(Object key, DataObject key2, boolean cookie) { JmeSpatialChildren children=new JmeSpatialChildren((com.jme3.scene.Spatial)key); children.setReadOnly(cookie); diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeVehicleControl.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeVehicleControl.java index 99ee2bbba..854482484 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeVehicleControl.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeVehicleControl.java @@ -35,8 +35,6 @@ import com.jme3.bullet.collision.shapes.CollisionShape; import com.jme3.bullet.control.VehicleControl; import com.jme3.bullet.objects.VehicleWheel; import com.jme3.gde.core.scene.SceneApplication; -import com.jme3.gde.core.sceneexplorer.nodes.AbstractSceneExplorerNode; -import com.jme3.gde.core.sceneexplorer.nodes.SceneExplorerNode; import com.jme3.math.Quaternion; import com.jme3.math.Vector3f; import com.jme3.scene.Spatial; @@ -168,10 +166,12 @@ public class JmeVehicleControl extends AbstractSceneExplorerNode { return VehicleControl.class; } + @Override public Class getExplorerNodeClass() { return JmeVehicleControl.class; } + @Override public org.openide.nodes.Node[] createNodes(Object key, DataObject key2, boolean cookie) { PhysicsVehicleChildren children = new PhysicsVehicleChildren((VehicleControl) key); children.setReadOnly(cookie); @@ -187,11 +187,13 @@ public class JmeVehicleControl extends AbstractSceneExplorerNode { this.control = control; } + @Override public void refreshChildren(boolean immediate) { setKeys(createKeys()); refresh(); } + @Override protected List createKeys() { try { return SceneApplication.getApplication().enqueue(new Callable>() { @@ -212,6 +214,7 @@ public class JmeVehicleControl extends AbstractSceneExplorerNode { return null; } + @Override public void setReadOnly(boolean cookie) { this.readOnly = cookie; } diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeVehicleWheel.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeVehicleWheel.java index 59c750f2a..7730aa6e2 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeVehicleWheel.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeVehicleWheel.java @@ -34,8 +34,6 @@ package com.jme3.gde.core.sceneexplorer.nodes; import com.jme3.bullet.control.VehicleControl; import com.jme3.bullet.objects.VehicleWheel; import com.jme3.gde.core.scene.SceneApplication; -import com.jme3.gde.core.sceneexplorer.nodes.AbstractSceneExplorerNode; -import com.jme3.gde.core.sceneexplorer.nodes.SceneExplorerNode; import com.jme3.light.Light; import com.jme3.math.Vector3f; import java.awt.Image; @@ -157,6 +155,7 @@ public class JmeVehicleWheel extends AbstractSceneExplorerNode{ return VehicleWheel.class; } + @Override public Class getExplorerNodeClass() { return JmeVehicleWheel.class; } diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/MeshGeometryPair.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/MeshGeometryPair.java index 8c14a3f4b..5f8f9892c 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/MeshGeometryPair.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/MeshGeometryPair.java @@ -32,7 +32,6 @@ package com.jme3.gde.core.sceneexplorer.nodes; -import com.jme3.light.Light; import com.jme3.scene.Geometry; import com.jme3.scene.Mesh; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/AddUserDataAction.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/AddUserDataAction.java index 4524f2dae..91c8df9aa 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/AddUserDataAction.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/AddUserDataAction.java @@ -32,8 +32,8 @@ package com.jme3.gde.core.sceneexplorer.nodes.actions; import com.jme3.gde.core.sceneexplorer.nodes.JmeSpatial; -import java.awt.event.ActionListener; import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import javax.swing.JFrame; public final class AddUserDataAction implements ActionListener { diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/NewSpatialPopup.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/NewSpatialPopup.java index 2b9f8e6f7..1dcb8bf3a 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/NewSpatialPopup.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/NewSpatialPopup.java @@ -32,9 +32,9 @@ package com.jme3.gde.core.sceneexplorer.nodes.actions; import com.jme3.audio.AudioNode; -import com.jme3.effect.shapes.EmitterSphereShape; import com.jme3.effect.ParticleEmitter; import com.jme3.effect.ParticleMesh; +import com.jme3.effect.shapes.EmitterSphereShape; import com.jme3.gde.core.scene.SceneApplication; import com.jme3.gde.core.sceneexplorer.nodes.JmeNode; import com.jme3.gde.core.undoredo.AbstractUndoableSceneEdit; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/ToolPopup.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/ToolPopup.java index 78ba83a06..f8a1a958e 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/ToolPopup.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/ToolPopup.java @@ -32,7 +32,6 @@ package com.jme3.gde.core.sceneexplorer.nodes.actions; import com.jme3.gde.core.sceneexplorer.nodes.AbstractSceneExplorerNode; -import com.jme3.scene.Spatial; import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.JMenu; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/TrackVisibilityPopup.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/TrackVisibilityPopup.java index 3f5e40419..5a90098f7 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/TrackVisibilityPopup.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/TrackVisibilityPopup.java @@ -34,11 +34,9 @@ package com.jme3.gde.core.sceneexplorer.nodes.actions; import com.jme3.gde.core.sceneexplorer.nodes.JmeAnimControl; import java.awt.event.ActionEvent; import javax.swing.AbstractAction; -import javax.swing.Action; import javax.swing.JCheckBoxMenuItem; import javax.swing.JMenu; import javax.swing.JMenuItem; -import org.openide.loaders.DataObject; import org.openide.util.actions.Presenter; /** diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/UserDataPicker.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/UserDataPicker.java index cde293a53..a61b228c7 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/UserDataPicker.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/UserDataPicker.java @@ -41,16 +41,12 @@ import com.jme3.gde.core.sceneexplorer.nodes.JmeSpatial; import java.awt.EventQueue; import java.util.HashSet; import java.util.Iterator; -import java.util.LinkedList; import java.util.List; import java.util.Set; import java.util.concurrent.ScheduledThreadPoolExecutor; -import java.util.concurrent.ThreadPoolExecutor; import javax.lang.model.element.TypeElement; import javax.lang.model.type.TypeMirror; import javax.swing.DefaultListModel; -import javax.swing.JComboBox; -import javax.swing.ListModel; import org.netbeans.api.java.classpath.ClassPath; import org.netbeans.api.java.project.JavaProjectConstants; import org.netbeans.api.java.source.ClassIndex; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/NewCharacterAction.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/NewCharacterAction.java index 068be89c6..29e40cb0f 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/NewCharacterAction.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/NewCharacterAction.java @@ -33,8 +33,6 @@ package com.jme3.gde.core.sceneexplorer.nodes.actions.impl; import com.jme3.bullet.collision.shapes.CapsuleCollisionShape; import com.jme3.bullet.control.CharacterControl; -import com.jme3.bullet.control.RigidBodyControl; -import com.jme3.gde.core.sceneexplorer.nodes.AbstractSceneExplorerNode; import com.jme3.gde.core.sceneexplorer.nodes.actions.AbstractNewControlAction; import com.jme3.gde.core.sceneexplorer.nodes.actions.NewControlAction; import com.jme3.scene.Node; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/SceneViewerTopComponent.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/SceneViewerTopComponent.java index 00c390822..4c9657fc2 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/SceneViewerTopComponent.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/SceneViewerTopComponent.java @@ -36,11 +36,6 @@ import java.awt.event.MouseWheelEvent; import java.awt.event.MouseWheelListener; import java.util.concurrent.Callable; import java.util.logging.Logger; -import org.netbeans.api.javahelp.Help; -import org.openide.util.NbBundle; -import org.openide.windows.TopComponent; -import org.openide.windows.WindowManager; -import org.openide.util.ImageUtilities; import org.netbeans.api.settings.ConvertAsProperties; import org.openide.DialogDisplayer; import org.openide.NotifyDescriptor; @@ -48,8 +43,11 @@ import org.openide.NotifyDescriptor.Message; import org.openide.awt.UndoRedo; import org.openide.util.Exceptions; import org.openide.util.HelpCtx; +import org.openide.util.ImageUtilities; import org.openide.util.Lookup; -import org.openide.util.NbPreferences; +import org.openide.util.NbBundle; +import org.openide.windows.TopComponent; +import org.openide.windows.WindowManager; /** * Top component which displays something. diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/actions/SwitchBackViewAction.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/actions/SwitchBackViewAction.java index 69cee51b4..8d377fbdf 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/actions/SwitchBackViewAction.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/actions/SwitchBackViewAction.java @@ -5,10 +5,10 @@ import com.jme3.gde.core.sceneviewer.SceneViewerTopComponent; import com.jme3.gde.core.util.CameraUtil.View; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import org.openide.awt.ActionRegistration; +import org.openide.awt.ActionID; import org.openide.awt.ActionReference; import org.openide.awt.ActionReferences; -import org.openide.awt.ActionID; +import org.openide.awt.ActionRegistration; import org.openide.util.NbBundle.Messages; @ActionID(category = "SceneComposer", diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/actions/SwitchBottomViewAction.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/actions/SwitchBottomViewAction.java index 28d8a165f..f4098fbcb 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/actions/SwitchBottomViewAction.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/actions/SwitchBottomViewAction.java @@ -5,10 +5,10 @@ import com.jme3.gde.core.sceneviewer.SceneViewerTopComponent; import com.jme3.gde.core.util.CameraUtil.View; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import org.openide.awt.ActionRegistration; +import org.openide.awt.ActionID; import org.openide.awt.ActionReference; import org.openide.awt.ActionReferences; -import org.openide.awt.ActionID; +import org.openide.awt.ActionRegistration; import org.openide.util.NbBundle.Messages; @ActionID(category = "SceneComposer", diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/actions/SwitchFrontViewAction.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/actions/SwitchFrontViewAction.java index bbe7d99a8..675044e21 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/actions/SwitchFrontViewAction.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/actions/SwitchFrontViewAction.java @@ -6,10 +6,9 @@ import com.jme3.gde.core.sceneviewer.SceneViewerTopComponent; import com.jme3.gde.core.util.CameraUtil.View; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import org.openide.awt.ActionRegistration; -import org.openide.awt.ActionReference; -import org.openide.awt.ActionReferences; import org.openide.awt.ActionID; +import org.openide.awt.ActionReferences; +import org.openide.awt.ActionRegistration; import org.openide.util.NbBundle.Messages; @ActionID(category = "SceneComposer", diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/actions/SwitchLeftViewAction.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/actions/SwitchLeftViewAction.java index 5c3436fa4..ca68a0bae 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/actions/SwitchLeftViewAction.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/actions/SwitchLeftViewAction.java @@ -5,10 +5,10 @@ import com.jme3.gde.core.sceneviewer.SceneViewerTopComponent; import com.jme3.gde.core.util.CameraUtil.View; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import org.openide.awt.ActionRegistration; +import org.openide.awt.ActionID; import org.openide.awt.ActionReference; import org.openide.awt.ActionReferences; -import org.openide.awt.ActionID; +import org.openide.awt.ActionRegistration; import org.openide.util.NbBundle.Messages; @ActionID(category = "SceneComposer", diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/actions/SwitchRightViewAction.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/actions/SwitchRightViewAction.java index 9988680e3..ccfbbed6c 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/actions/SwitchRightViewAction.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/actions/SwitchRightViewAction.java @@ -5,10 +5,10 @@ import com.jme3.gde.core.sceneviewer.SceneViewerTopComponent; import com.jme3.gde.core.util.CameraUtil.View; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import org.openide.awt.ActionRegistration; +import org.openide.awt.ActionID; import org.openide.awt.ActionReference; import org.openide.awt.ActionReferences; -import org.openide.awt.ActionID; +import org.openide.awt.ActionRegistration; import org.openide.util.NbBundle.Messages; @ActionID(category = "SceneComposer", diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/actions/SwitchTopViewAction.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/actions/SwitchTopViewAction.java index 5b84ca387..ca51f7972 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/actions/SwitchTopViewAction.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/actions/SwitchTopViewAction.java @@ -5,10 +5,10 @@ import com.jme3.gde.core.sceneviewer.SceneViewerTopComponent; import com.jme3.gde.core.util.CameraUtil.View; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import org.openide.awt.ActionRegistration; +import org.openide.awt.ActionID; import org.openide.awt.ActionReference; import org.openide.awt.ActionReferences; -import org.openide.awt.ActionID; +import org.openide.awt.ActionRegistration; import org.openide.util.NbBundle.Messages; @ActionID(category = "SceneComposer", diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/actions/ToggleOrthoPerspAction.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/actions/ToggleOrthoPerspAction.java index cbbdb4dc0..1d9699011 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/actions/ToggleOrthoPerspAction.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/actions/ToggleOrthoPerspAction.java @@ -1,14 +1,13 @@ package com.jme3.gde.core.sceneviewer.actions; import com.jme3.gde.core.scene.SceneApplication; -import com.jme3.gde.core.scene.SceneRequest; import com.jme3.gde.core.sceneviewer.SceneViewerTopComponent; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import org.openide.awt.ActionRegistration; +import org.openide.awt.ActionID; import org.openide.awt.ActionReference; import org.openide.awt.ActionReferences; -import org.openide.awt.ActionID; +import org.openide.awt.ActionRegistration; import org.openide.util.NbBundle.Messages; @ActionID(category = "SceneComposer", diff --git a/sdk/jme3-core/src/com/jme3/gde/core/util/ButtonInplaceEditor.java b/sdk/jme3-core/src/com/jme3/gde/core/util/ButtonInplaceEditor.java index a3e0fd9af..faccc7ea1 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/util/ButtonInplaceEditor.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/util/ButtonInplaceEditor.java @@ -3,7 +3,6 @@ package com.jme3.gde.core.util; import java.awt.Color; import java.awt.Component; import java.beans.PropertyEditor; -import javax.swing.DefaultButtonModel; import javax.swing.Icon; import javax.swing.JButton; import javax.swing.JComponent; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/util/SliderInplaceEditor.java b/sdk/jme3-core/src/com/jme3/gde/core/util/SliderInplaceEditor.java index 3a71af2e8..c95c1dac9 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/util/SliderInplaceEditor.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/util/SliderInplaceEditor.java @@ -1,10 +1,7 @@ package com.jme3.gde.core.util; -import java.awt.Color; import java.awt.Component; import java.awt.event.ActionListener; -import java.awt.event.KeyEvent; -import java.awt.event.KeyListener; import java.beans.PropertyEditor; import javax.swing.JComponent; import javax.swing.KeyStroke; diff --git a/sdk/jme3-core/src/com/jme3/gde/core/util/ToggleButtonGroup.java b/sdk/jme3-core/src/com/jme3/gde/core/util/ToggleButtonGroup.java index d30cc98d1..648b07db8 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/util/ToggleButtonGroup.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/util/ToggleButtonGroup.java @@ -45,6 +45,7 @@ import javax.swing.ButtonModel; public class ToggleButtonGroup extends ButtonGroup { private ButtonModel modifiedSelection; + @Override public void add(AbstractButton b) { if (b == null) { return; @@ -62,6 +63,7 @@ public class ToggleButtonGroup extends ButtonGroup { b.getModel().setGroup(this); } + @Override public void remove(AbstractButton b) { if (b == null) { return; @@ -73,10 +75,12 @@ public class ToggleButtonGroup extends ButtonGroup { b.getModel().setGroup(null); } + @Override public ButtonModel getSelection() { return modifiedSelection; } + @Override public void setSelected(ButtonModel m, boolean b) { if (!b && m == modifiedSelection) { modifiedSelection = null; @@ -92,6 +96,7 @@ public class ToggleButtonGroup extends ButtonGroup { } } + @Override public boolean isSelected(ButtonModel m) { return (m == modifiedSelection); }