Browse Source

Move Animation related Nodes into the animation subpackage.

MeFisto94 5 years ago
parent
commit
031a98cf1d
18 changed files with 56 additions and 34 deletions
  1. 9 0
      jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/AbstractSceneExplorerNode.java
  2. 1 1
      jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeControl.java
  3. 2 0
      jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeTrackChildren.java
  4. 1 1
      jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/ChannelDialog.java
  5. 1 1
      jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/ExtractSubAnimationDialog.java
  6. 1 1
      jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/TrackVisibilityPopup.java
  7. 1 1
      jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/tracks/AudioTrackVisualPanel1.java
  8. 1 1
      jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/tracks/AudioTrackWizardAction.java
  9. 1 1
      jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/tracks/AudioTrackWizardPanel1.java
  10. 1 1
      jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/tracks/EffectTrackVisualPanel1.java
  11. 1 1
      jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/tracks/EffectTrackWizardAction.java
  12. 1 1
      jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/tracks/EffectTrackWizardPanel1.java
  13. 2 1
      jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/animation/JmeAnimChildren.java
  14. 4 1
      jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/animation/JmeAnimControl.java
  15. 21 19
      jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/animation/JmeAnimation.java
  16. 4 1
      jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/animation/JmeBone.java
  17. 1 1
      jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/animation/JmeBoneChildren.java
  18. 3 1
      jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/animation/JmeSkeletonControl.java

+ 9 - 0
jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/AbstractSceneExplorerNode.java

@@ -124,6 +124,15 @@ public abstract class AbstractSceneExplorerNode extends AbstractNode implements
         this.readOnly = readOnly;
         this.readOnly = readOnly;
         return this;
         return this;
     }
     }
+    
+    /**
+     * Whether this Node is read-only which means it cannot be deleted, cutted or copied.
+     * These are the actions you will see in the Context Menu of this Node.
+     * @return The Read Only Status
+     */
+    public boolean isReadOnly() {
+        return readOnly;
+    }
 
 
     //TODO: refresh does not work
     //TODO: refresh does not work
     public void refresh(boolean immediate) {
     public void refresh(boolean immediate) {

+ 1 - 1
jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeControl.java

@@ -114,7 +114,7 @@ public abstract class JmeControl extends AbstractSceneExplorerNode {
     
     
     /* Controls have a parental node containing them */
     /* Controls have a parental node containing them */
     @Override
     @Override
-    protected void fireSave(boolean modified) {
+    public void fireSave(boolean modified) {
         super.fireSave(true);
         super.fireSave(true);
         Node parent = getParentNode();
         Node parent = getParentNode();
         if (parent instanceof AbstractSceneExplorerNode) {
         if (parent instanceof AbstractSceneExplorerNode) {

+ 2 - 0
jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeTrackChildren.java

@@ -31,6 +31,8 @@
  */
  */
 package com.jme3.gde.core.sceneexplorer.nodes;
 package com.jme3.gde.core.sceneexplorer.nodes;
 
 
+import com.jme3.gde.core.sceneexplorer.nodes.animation.JmeAnimation;
+import com.jme3.gde.core.sceneexplorer.nodes.animation.JmeAnimControl;
 import com.jme3.animation.AnimControl;
 import com.jme3.animation.AnimControl;
 import com.jme3.animation.Animation;
 import com.jme3.animation.Animation;
 import com.jme3.animation.AudioTrack;
 import com.jme3.animation.AudioTrack;

+ 1 - 1
jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/ChannelDialog.java

@@ -32,7 +32,7 @@
 package com.jme3.gde.core.sceneexplorer.nodes.actions;
 package com.jme3.gde.core.sceneexplorer.nodes.actions;
 
 
 import com.jme3.animation.LoopMode;
 import com.jme3.animation.LoopMode;
-import com.jme3.gde.core.sceneexplorer.nodes.JmeAnimation;
+import com.jme3.gde.core.sceneexplorer.nodes.animation.JmeAnimation;
 
 
 /**
 /**
  *
  *

+ 1 - 1
jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/ExtractSubAnimationDialog.java

@@ -36,7 +36,7 @@ import com.jme3.animation.Animation;
 import com.jme3.animation.BoneTrack;
 import com.jme3.animation.BoneTrack;
 import com.jme3.animation.Track;
 import com.jme3.animation.Track;
 import com.jme3.gde.core.scene.SceneApplication;
 import com.jme3.gde.core.scene.SceneApplication;
-import com.jme3.gde.core.sceneexplorer.nodes.JmeAnimControl;
+import com.jme3.gde.core.sceneexplorer.nodes.animation.JmeAnimControl;
 import com.jme3.math.Quaternion;
 import com.jme3.math.Quaternion;
 import com.jme3.math.Transform;
 import com.jme3.math.Transform;
 import com.jme3.math.Vector3f;
 import com.jme3.math.Vector3f;

+ 1 - 1
jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/TrackVisibilityPopup.java

@@ -31,7 +31,7 @@
  */
  */
 package com.jme3.gde.core.sceneexplorer.nodes.actions;
 package com.jme3.gde.core.sceneexplorer.nodes.actions;
 
 
-import com.jme3.gde.core.sceneexplorer.nodes.JmeAnimControl;
+import com.jme3.gde.core.sceneexplorer.nodes.animation.JmeAnimControl;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionEvent;
 import javax.swing.AbstractAction;
 import javax.swing.AbstractAction;
 import javax.swing.JCheckBoxMenuItem;
 import javax.swing.JCheckBoxMenuItem;

+ 1 - 1
jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/tracks/AudioTrackVisualPanel1.java

@@ -34,7 +34,7 @@ package com.jme3.gde.core.sceneexplorer.nodes.actions.impl.tracks;
 import com.jme3.animation.Animation;
 import com.jme3.animation.Animation;
 import com.jme3.audio.AudioNode;
 import com.jme3.audio.AudioNode;
 import com.jme3.gde.core.icons.IconList;
 import com.jme3.gde.core.icons.IconList;
-import com.jme3.gde.core.sceneexplorer.nodes.JmeAnimation;
+import com.jme3.gde.core.sceneexplorer.nodes.animation.JmeAnimation;
 import com.jme3.scene.Node;
 import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
 import com.jme3.scene.Spatial;
 import java.awt.Component;
 import java.awt.Component;

+ 1 - 1
jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/tracks/AudioTrackWizardAction.java

@@ -34,7 +34,7 @@ package com.jme3.gde.core.sceneexplorer.nodes.actions.impl.tracks;
 import com.jme3.animation.Animation;
 import com.jme3.animation.Animation;
 import com.jme3.animation.AudioTrack;
 import com.jme3.animation.AudioTrack;
 import com.jme3.audio.AudioNode;
 import com.jme3.audio.AudioNode;
-import com.jme3.gde.core.sceneexplorer.nodes.JmeAnimation;
+import com.jme3.gde.core.sceneexplorer.nodes.animation.JmeAnimation;
 import com.jme3.scene.Spatial;
 import com.jme3.scene.Spatial;
 import java.awt.Component;
 import java.awt.Component;
 import java.awt.Dialog;
 import java.awt.Dialog;

+ 1 - 1
jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/tracks/AudioTrackWizardPanel1.java

@@ -31,7 +31,7 @@
  */
  */
 package com.jme3.gde.core.sceneexplorer.nodes.actions.impl.tracks;
 package com.jme3.gde.core.sceneexplorer.nodes.actions.impl.tracks;
 
 
-import com.jme3.gde.core.sceneexplorer.nodes.JmeAnimation;
+import com.jme3.gde.core.sceneexplorer.nodes.animation.JmeAnimation;
 import com.jme3.scene.Spatial;
 import com.jme3.scene.Spatial;
 import java.awt.Component;
 import java.awt.Component;
 import javax.swing.event.ChangeListener;
 import javax.swing.event.ChangeListener;

+ 1 - 1
jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/tracks/EffectTrackVisualPanel1.java

@@ -34,7 +34,7 @@ package com.jme3.gde.core.sceneexplorer.nodes.actions.impl.tracks;
 import com.jme3.animation.Animation;
 import com.jme3.animation.Animation;
 import com.jme3.effect.ParticleEmitter;
 import com.jme3.effect.ParticleEmitter;
 import com.jme3.gde.core.icons.IconList;
 import com.jme3.gde.core.icons.IconList;
-import com.jme3.gde.core.sceneexplorer.nodes.JmeAnimation;
+import com.jme3.gde.core.sceneexplorer.nodes.animation.JmeAnimation;
 import com.jme3.scene.Node;
 import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
 import com.jme3.scene.Spatial;
 import java.awt.Component;
 import java.awt.Component;

+ 1 - 1
jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/tracks/EffectTrackWizardAction.java

@@ -34,7 +34,7 @@ package com.jme3.gde.core.sceneexplorer.nodes.actions.impl.tracks;
 import com.jme3.animation.Animation;
 import com.jme3.animation.Animation;
 import com.jme3.animation.EffectTrack;
 import com.jme3.animation.EffectTrack;
 import com.jme3.effect.ParticleEmitter;
 import com.jme3.effect.ParticleEmitter;
-import com.jme3.gde.core.sceneexplorer.nodes.JmeAnimation;
+import com.jme3.gde.core.sceneexplorer.nodes.animation.JmeAnimation;
 import com.jme3.scene.Spatial;
 import com.jme3.scene.Spatial;
 import java.awt.Component;
 import java.awt.Component;
 import java.awt.Dialog;
 import java.awt.Dialog;

+ 1 - 1
jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/tracks/EffectTrackWizardPanel1.java

@@ -31,7 +31,7 @@
  */
  */
 package com.jme3.gde.core.sceneexplorer.nodes.actions.impl.tracks;
 package com.jme3.gde.core.sceneexplorer.nodes.actions.impl.tracks;
 
 
-import com.jme3.gde.core.sceneexplorer.nodes.JmeAnimation;
+import com.jme3.gde.core.sceneexplorer.nodes.animation.JmeAnimation;
 import com.jme3.scene.Spatial;
 import com.jme3.scene.Spatial;
 import java.awt.Component;
 import java.awt.Component;
 import javax.swing.event.ChangeListener;
 import javax.swing.event.ChangeListener;

+ 2 - 1
jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeAnimChildren.java → jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/animation/JmeAnimChildren.java

@@ -29,11 +29,12 @@
  *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
  */
-package com.jme3.gde.core.sceneexplorer.nodes;
+package com.jme3.gde.core.sceneexplorer.nodes.animation;
 
 
 import com.jme3.animation.AnimControl;
 import com.jme3.animation.AnimControl;
 import com.jme3.animation.Animation;
 import com.jme3.animation.Animation;
 import com.jme3.gde.core.scene.SceneApplication;
 import com.jme3.gde.core.scene.SceneApplication;
+import com.jme3.gde.core.sceneexplorer.nodes.JmeTrackChildren;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.List;

+ 4 - 1
jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeAnimControl.java → jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/animation/JmeAnimControl.java

@@ -29,11 +29,14 @@
  *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
  */
-package com.jme3.gde.core.sceneexplorer.nodes;
+package com.jme3.gde.core.sceneexplorer.nodes.animation;
 
 
 import com.jme3.animation.AnimControl;
 import com.jme3.animation.AnimControl;
 import com.jme3.gde.core.icons.IconList;
 import com.jme3.gde.core.icons.IconList;
 import com.jme3.gde.core.properties.AnimationProperty;
 import com.jme3.gde.core.properties.AnimationProperty;
+import com.jme3.gde.core.sceneexplorer.nodes.JmeControl;
+import com.jme3.gde.core.sceneexplorer.nodes.JmeTrackChildren;
+import com.jme3.gde.core.sceneexplorer.nodes.SceneExplorerNode;
 import com.jme3.gde.core.sceneexplorer.nodes.actions.ControlsPopup;
 import com.jme3.gde.core.sceneexplorer.nodes.actions.ControlsPopup;
 import com.jme3.gde.core.sceneexplorer.nodes.actions.TrackVisibilityPopup;
 import com.jme3.gde.core.sceneexplorer.nodes.actions.TrackVisibilityPopup;
 import java.awt.Image;
 import java.awt.Image;

+ 21 - 19
jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeAnimation.java → jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/animation/JmeAnimation.java

@@ -29,7 +29,7 @@
  *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
  */
-package com.jme3.gde.core.sceneexplorer.nodes;
+package com.jme3.gde.core.sceneexplorer.nodes.animation;
 
 
 import com.jme3.animation.AnimChannel;
 import com.jme3.animation.AnimChannel;
 import com.jme3.animation.AnimControl;
 import com.jme3.animation.AnimControl;
@@ -39,6 +39,9 @@ import com.jme3.animation.LoopMode;
 import com.jme3.gde.core.icons.IconList;
 import com.jme3.gde.core.icons.IconList;
 import com.jme3.gde.core.properties.AnimationProperty;
 import com.jme3.gde.core.properties.AnimationProperty;
 import com.jme3.gde.core.scene.SceneApplication;
 import com.jme3.gde.core.scene.SceneApplication;
+import com.jme3.gde.core.sceneexplorer.nodes.AbstractSceneExplorerNode;
+import com.jme3.gde.core.sceneexplorer.nodes.JmeTrackChildren;
+import com.jme3.gde.core.sceneexplorer.nodes.SceneExplorerNode;
 import com.jme3.gde.core.sceneexplorer.nodes.actions.ChannelDialog;
 import com.jme3.gde.core.sceneexplorer.nodes.actions.ChannelDialog;
 import com.jme3.gde.core.sceneexplorer.nodes.actions.ExtractSubAnimationDialog;
 import com.jme3.gde.core.sceneexplorer.nodes.actions.ExtractSubAnimationDialog;
 import com.jme3.gde.core.sceneexplorer.nodes.actions.impl.tracks.AudioTrackWizardAction;
 import com.jme3.gde.core.sceneexplorer.nodes.actions.impl.tracks.AudioTrackWizardAction;
@@ -177,7 +180,7 @@ public class JmeAnimation extends AbstractSceneExplorerNode {
 
 
     @Override
     @Override
     public boolean canDestroy() {
     public boolean canDestroy() {
-         return !jmeControl.readOnly;        
+         return !jmeControl.isReadOnly();
     }
     }
 
 
     public void stop() {
     public void stop() {
@@ -193,6 +196,7 @@ public class JmeAnimation extends AbstractSceneExplorerNode {
             lookupContents.remove(JmeAnimation.this.animation);
             lookupContents.remove(JmeAnimation.this.animation);
             lookupContents.remove(this);
             lookupContents.remove(this);
             SceneApplication.getApplication().enqueue(new Callable<Void>() {
             SceneApplication.getApplication().enqueue(new Callable<Void>() {
+                @Override
                 public Void call() throws Exception {
                 public Void call() throws Exception {
                     control.removeAnim(JmeAnimation.this.animation);                    
                     control.removeAnim(JmeAnimation.this.animation);                    
                     return null;
                     return null;
@@ -200,9 +204,7 @@ public class JmeAnimation extends AbstractSceneExplorerNode {
             }).get();            
             }).get();            
             jmeControl.refreshChildren();
             jmeControl.refreshChildren();
             setChanged();
             setChanged();
-        } catch (InterruptedException ex) {
-            Exceptions.printStackTrace(ex);
-        } catch (ExecutionException ex) {
+        } catch (InterruptedException | ExecutionException ex) {
             Exceptions.printStackTrace(ex);
             Exceptions.printStackTrace(ex);
         }
         }
         
         
@@ -214,6 +216,7 @@ public class JmeAnimation extends AbstractSceneExplorerNode {
         ((JmeTrackChildren) getChildren()).refreshChildren(false);
         ((JmeTrackChildren) getChildren()).refreshChildren(false);
     }
     }
 
 
+    @Override
     public Class getExplorerObjectClass() {
     public Class getExplorerObjectClass() {
         return Animation.class;
         return Animation.class;
     }
     }
@@ -232,6 +235,7 @@ public class JmeAnimation extends AbstractSceneExplorerNode {
 
 
     class PlayAction implements ActionListener {
     class PlayAction implements ActionListener {
 
 
+        @Override
         public void actionPerformed(ActionEvent e) {
         public void actionPerformed(ActionEvent e) {
             final AnimControl control = jmeControl.getLookup().lookup(AnimControl.class);
             final AnimControl control = jmeControl.getLookup().lookup(AnimControl.class);
             if (control == null) {
             if (control == null) {
@@ -240,6 +244,7 @@ public class JmeAnimation extends AbstractSceneExplorerNode {
 
 
             try {
             try {
                 SceneApplication.getApplication().enqueue(new Callable<Void>() {
                 SceneApplication.getApplication().enqueue(new Callable<Void>() {
+                    @Override
                     public Void call() throws Exception {
                     public Void call() throws Exception {
                         if (playing) {
                         if (playing) {
                             control.clearChannels();
                             control.clearChannels();
@@ -253,6 +258,7 @@ public class JmeAnimation extends AbstractSceneExplorerNode {
                         innerSetLoopMode();
                         innerSetLoopMode();
                         channel.setSpeed(animSpeed);
                         channel.setSpeed(animSpeed);
                         java.awt.EventQueue.invokeLater(new Runnable() {
                         java.awt.EventQueue.invokeLater(new Runnable() {
+                            @Override
                             public void run() {
                             public void run() {
                                 play();
                                 play();
                             }
                             }
@@ -261,12 +267,8 @@ public class JmeAnimation extends AbstractSceneExplorerNode {
 
 
                     }
                     }
                 }).get();
                 }).get();
-            } catch (InterruptedException ex) {
+            } catch (InterruptedException | ExecutionException ex) {
                 Exceptions.printStackTrace(ex);
                 Exceptions.printStackTrace(ex);
-                return;
-            } catch (ExecutionException ex) {
-                Exceptions.printStackTrace(ex);
-                return;
             }
             }
 
 
         }
         }
@@ -286,6 +288,7 @@ public class JmeAnimation extends AbstractSceneExplorerNode {
                             channel = null;
                             channel = null;
                             jmeControl.setAnim(null);
                             jmeControl.setAnim(null);
                             java.awt.EventQueue.invokeLater(new Runnable() {
                             java.awt.EventQueue.invokeLater(new Runnable() {
+                                @Override
                                 public void run() {
                                 public void run() {
                                     stop();
                                     stop();
                                 }
                                 }
@@ -296,6 +299,7 @@ public class JmeAnimation extends AbstractSceneExplorerNode {
                     }
                     }
                 }
                 }
 
 
+                @Override
                 public void onAnimChange(AnimControl ac, AnimChannel ac1, String animName) {
                 public void onAnimChange(AnimControl ac, AnimChannel ac1, String animName) {
 //                    if (animation.getName().equals(ac1.getAnimationName())) {
 //                    if (animation.getName().equals(ac1.getAnimationName())) {
 //                         java.awt.EventQueue.invokeLater(new Runnable() {
 //                         java.awt.EventQueue.invokeLater(new Runnable() {
@@ -314,6 +318,7 @@ public class JmeAnimation extends AbstractSceneExplorerNode {
 
 
         ChannelDialog dialog = new ChannelDialog(null, false, JmeAnimation.this);
         ChannelDialog dialog = new ChannelDialog(null, false, JmeAnimation.this);
 
 
+        @Override
         public void actionPerformed(ActionEvent e) {
         public void actionPerformed(ActionEvent e) {
             dialog.setLocationRelativeTo(null);
             dialog.setLocationRelativeTo(null);
             dialog.setVisible(true);
             dialog.setVisible(true);
@@ -330,6 +335,7 @@ public class JmeAnimation extends AbstractSceneExplorerNode {
 
 
         try {
         try {
             SceneApplication.getApplication().enqueue(new Callable<Void>() {
             SceneApplication.getApplication().enqueue(new Callable<Void>() {
+                @Override
                 public Void call() throws Exception {
                 public Void call() throws Exception {
                     if (channel != null) {
                     if (channel != null) {
                         innerSetLoopMode();
                         innerSetLoopMode();
@@ -338,13 +344,9 @@ public class JmeAnimation extends AbstractSceneExplorerNode {
                     return null;
                     return null;
                 }
                 }
             }).get();
             }).get();
-        } catch (InterruptedException ex) {
-            Exceptions.printStackTrace(ex);
-        } catch (ExecutionException ex) {
+        } catch (InterruptedException | ExecutionException ex) {
             Exceptions.printStackTrace(ex);
             Exceptions.printStackTrace(ex);
         }
         }
-
-
     }
     }
 
 
     public float getAnimSpeed() {
     public float getAnimSpeed() {
@@ -355,6 +357,7 @@ public class JmeAnimation extends AbstractSceneExplorerNode {
         this.animSpeed = speed;
         this.animSpeed = speed;
         try {
         try {
             SceneApplication.getApplication().enqueue(new Callable<Void>() {
             SceneApplication.getApplication().enqueue(new Callable<Void>() {
+                @Override
                 public Void call() throws Exception {
                 public Void call() throws Exception {
                     if (channel != null) {
                     if (channel != null) {
                         channel.setSpeed(animSpeed);
                         channel.setSpeed(animSpeed);
@@ -362,9 +365,7 @@ public class JmeAnimation extends AbstractSceneExplorerNode {
                     return null;
                     return null;
                 }
                 }
             }).get();
             }).get();
-        } catch (InterruptedException ex) {
-            Exceptions.printStackTrace(ex);
-        } catch (ExecutionException ex) {
+        } catch (InterruptedException | ExecutionException ex) {
             Exceptions.printStackTrace(ex);
             Exceptions.printStackTrace(ex);
         }
         }
 
 
@@ -374,6 +375,7 @@ public class JmeAnimation extends AbstractSceneExplorerNode {
 
 
         ExtractSubAnimationDialog dialog = new ExtractSubAnimationDialog();
         ExtractSubAnimationDialog dialog = new ExtractSubAnimationDialog();
 
 
+        @Override
         public void actionPerformed(ActionEvent e) {
         public void actionPerformed(ActionEvent e) {
             try {
             try {
                 dialog.setAnimControl(JmeAnimation.this.jmeControl);
                 dialog.setAnimControl(JmeAnimation.this.jmeControl);
@@ -431,7 +433,7 @@ public class JmeAnimation extends AbstractSceneExplorerNode {
 
 
     @Override
     @Override
     public boolean canRename() {
     public boolean canRename() {
-        return !jmeControl.readOnly;        
+        return !jmeControl.isReadOnly();        
     }
     }
     
     
     /**
     /**

+ 4 - 1
jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeBone.java → jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/animation/JmeBone.java

@@ -29,11 +29,14 @@
  *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
  */
-package com.jme3.gde.core.sceneexplorer.nodes;
+package com.jme3.gde.core.sceneexplorer.nodes.animation;
 
 
 import com.jme3.animation.Bone;
 import com.jme3.animation.Bone;
 import com.jme3.gde.core.icons.IconList;
 import com.jme3.gde.core.icons.IconList;
 import com.jme3.gde.core.scene.SceneApplication;
 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 java.awt.Image;
 import java.awt.Image;
 import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.DataFlavor;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionEvent;

+ 1 - 1
jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeBoneChildren.java → jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/animation/JmeBoneChildren.java

@@ -29,7 +29,7 @@
  *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
  */
-package com.jme3.gde.core.sceneexplorer.nodes;
+package com.jme3.gde.core.sceneexplorer.nodes.animation;
 
 
 import com.jme3.animation.Bone;
 import com.jme3.animation.Bone;
 import com.jme3.gde.core.scene.SceneApplication;
 import com.jme3.gde.core.scene.SceneApplication;

+ 3 - 1
jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeSkeletonControl.java → jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/animation/JmeSkeletonControl.java

@@ -29,10 +29,12 @@
  *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
  */
-package com.jme3.gde.core.sceneexplorer.nodes;
+package com.jme3.gde.core.sceneexplorer.nodes.animation;
 
 
 import com.jme3.animation.SkeletonControl;
 import com.jme3.animation.SkeletonControl;
 import com.jme3.gde.core.icons.IconList;
 import com.jme3.gde.core.icons.IconList;
+import com.jme3.gde.core.sceneexplorer.nodes.JmeControl;
+import com.jme3.gde.core.sceneexplorer.nodes.SceneExplorerNode;
 import java.awt.Image;
 import java.awt.Image;
 import org.openide.loaders.DataObject;
 import org.openide.loaders.DataObject;
 import org.openide.nodes.Node;
 import org.openide.nodes.Node;