sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SDK:

Browse Source 
- cleanup imports and other small things in SDK-Core

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10103 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
nor..67 2013-01-18 23:31:12 +00:00
parent 6307a254a4
commit 0ff6cb8fc3
92 changed files with 124 additions and 151 deletions
sdk/jme3-core/src/com/jme3/gde/core
Installer.java
appstates
NewAppStateVisualPanel1.javaNewAppStateWizardPanel1.java
assets
AssetDataNode.javaAssetsLookupProvider.javaBinaryModelFileLoader.javaProjectAssetManager.javaSpatialAssetDataObject.java
actions
ConvertModel.javaOpenModel.java
nodes
AssetNode.javaProjectAssetsNode.java
codeless
CodelessProject.javaCodelessProjectWizardAction.javaCodelessProjectWizardWizardPanel1.java
editor
SceneEditorTopComponent.javaSpatialAssetOpenSupport.java
filters
AbstractFilterNode.javaFilterExplorerTopComponent.javaFilterIndexSupport.javaFilterPostProcessorNode.javaOpenFilterAction.java
actions
EnableFiterAction.javaNewFilterPopup.java
impl
JmeCartoonEdgeFilter.javaJmeColorOverlayFilter.javaJmeCrossHatchFilter.javaJmeFXAAFilter.javaJmeFogFilter.javaJmeLightScatteringFilter.javaJmeSSAOFilter.javaJmeWaterFilter.javaNewSSAOFilterAction.java
j2seproject
J2seImportantFiles.java
layer.xml
navigator
NavigatorNode.java
properties
AudioDataPropertyEditor.javaAudioTrackPropertyEditor.javaEffectTrackEmitterPropertyEditor.java
scene
FakeApplication.javaOffScenePanel.javaSceneApplication.java
controller
AbstractCameraController.javaSceneToolController.java
sceneexplorer
MaterialChangeProvider.javaSceneExplorerTopComponent.java
nodes
AbstractSceneExplorerNode.javaJmeAmbientLight.javaJmeAnimControl.javaJmeAssetLinkNode.javaJmeAudioNode.javaJmeBitmapText.javaJmeBone.javaJmeCharacterControl.javaJmeDirectionalLight.javaJmeDistanceLodCalculator.javaJmeGenericControl.javaJmeGeometry.javaJmeGhostControl.javaJmeLight.javaJmeMesh.javaJmeNode.javaJmeParticleEmitter.javaJmeParticleEmitterButtonProperty.javaJmePicture.javaJmePointLight.javaJmeRigidBodyControl.javaJmeSpatial.javaJmeSpotLight.javaJmeTerrainGrid.javaJmeTerrainLodControl.javaJmeTerrainQuad.javaJmeVehicleControl.javaJmeVehicleWheel.javaMeshGeometryPair.java
actions
AddUserDataAction.javaNewSpatialPopup.javaToolPopup.javaTrackVisibilityPopup.javaUserDataPicker.java
impl
NewCharacterAction.java
sceneviewer
SceneViewerTopComponent.java
actions
SwitchBackViewAction.javaSwitchBottomViewAction.javaSwitchFrontViewAction.javaSwitchLeftViewAction.javaSwitchRightViewAction.javaSwitchTopViewAction.javaToggleOrthoPerspAction.java
util
ButtonInplaceEditor.javaSliderInplaceEditor.javaToggleButtonGroup.java

2
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;

1
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;

1
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;

2
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;

1
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;

1
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;

2
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;

5
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);

2
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;

3
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;

7
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,7 +55,10 @@ 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);
}

4
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;
}

2
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;

1
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;

3
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 {

4
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.

8
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();
}

1
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;

6
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.

1
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]));

2
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;

7
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",

2
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;

1
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;

1
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;

1
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;

1
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;

1
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;

1
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;

1
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;

2
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;

1
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;

1
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;
/**
*

1
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;

4
sdk/jme3-core/src/com/jme3/gde/core/layer.xml

@ -211,6 +211,10 @@
</folder>
<folder name="jme3model">
<folder name="Actions">
<!--file name="org-openide-actions-OpenAction.shadow">
<attr name="originalFile" stringvalue="Actions/System/org-openide-actions-OpenAction.instance"/>
<attr name="position" intvalue="100"/>
</file-->
<file name="org-openide-actions-CopyAction.shadow">
<attr name="originalFile" stringvalue="Actions/Edit/org-openide-actions-CopyAction.instance"/>
<attr name="position" intvalue="300"/>

1
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();
}

1
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;

1
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;

1
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;

1
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;

1
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;

3
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;
}

1
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());
}

2
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;

1
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;
/**

11
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());
}

2
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){

4
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;
}

1
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;
}

6
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<Object> createKeys() {
try {
return SceneApplication.getApplication().enqueue(new Callable<List<Object>>() {
@ -173,6 +178,7 @@ public class JmeAssetLinkNode extends JmeNode {
return null;
}
@Override
public void setReadOnly(boolean cookie) {
this.readOnly = cookie;
}

4
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);

4
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);

2
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);

4
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)};
}

4
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;
}

2
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;

4
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;

2
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;

4
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)};
}

3
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;
}

3
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;
}

7
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);

2
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;

3
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;

4
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);

2
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;
}

4
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)};
}

9
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);

2
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;
}

5
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);

1
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;

4
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);

7
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<Object> createKeys() {
try {
return SceneApplication.getApplication().enqueue(new Callable<List<Object>>() {
@ -212,6 +214,7 @@ public class JmeVehicleControl extends AbstractSceneExplorerNode {
return null;
}
@Override
public void setReadOnly(boolean cookie) {
this.readOnly = cookie;
}

3
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;
}

1
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;

2
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 {

2
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;

1
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;

2
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;
/**

4
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;

2
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;

10
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.

4
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",

4
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",

5
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",

4
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",

4
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",

4
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",

5
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",

1
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;

3
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;

5
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);
}