- fix imports across engine

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9451 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-06-03 13:10:26 +00:00 · 2012-06-03 13:10:26 +00:00 · ea0be5cf9f
commit ea0be5cf9f
parent 83f56bda4e
94 changed files with 202 additions and 285 deletions
--- a/engine/src/android/com/jme3/app/AndroidHarness.java
+++ b/engine/src/android/com/jme3/app/AndroidHarness.java
@ -8,8 +8,8 @@ import android.graphics.drawable.Drawable;
 import android.graphics.drawable.NinePatchDrawable;
 import android.opengl.GLSurfaceView;
 import android.os.Bundle;
-import android.view.ViewGroup.LayoutParams;
 import android.view.*;
+import android.view.ViewGroup.LayoutParams;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
@ -20,7 +20,6 @@ import com.jme3.input.controls.TouchListener;
 import com.jme3.input.controls.TouchTrigger;
 import com.jme3.input.event.TouchEvent;
 import com.jme3.system.AppSettings;
-import com.jme3.system.JmeSystem;
 import com.jme3.system.SystemListener;
 import com.jme3.system.android.AndroidConfigChooser.ConfigType;
 import com.jme3.system.android.JmeAndroidSystem;
--- a/engine/src/android/com/jme3/audio/android/AndroidAudioRenderer.java
+++ b/engine/src/android/com/jme3/audio/android/AndroidAudioRenderer.java
@ -38,10 +38,9 @@ import android.content.res.AssetManager;
 import android.media.AudioManager;
 import android.media.MediaPlayer;
 import android.media.SoundPool;
-
 import com.jme3.asset.AssetKey;
-import com.jme3.audio.AudioNode.Status;
 import com.jme3.audio.*;
+import com.jme3.audio.AudioNode.Status;
 import com.jme3.math.FastMath;
 import com.jme3.math.Vector3f;
 import java.io.IOException;
--- a/engine/src/android/com/jme3/system/android/JmeAndroidSystem.java
+++ b/engine/src/android/com/jme3/system/android/JmeAndroidSystem.java
@ -2,7 +2,6 @@ package com.jme3.system.android;

 import android.app.Activity;
 import android.os.Environment;
-import android.util.Log;
 import com.jme3.asset.AndroidAssetManager;
 import com.jme3.asset.AssetManager;
 import com.jme3.audio.AudioRenderer;
--- a/engine/src/android/jme3test/android/DemoMainActivity.java
+++ b/engine/src/android/jme3test/android/DemoMainActivity.java
@ -4,9 +4,9 @@ import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.os.Bundle;
 import android.view.View;
+import android.widget.*;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.AdapterView.OnItemSelectedListener;
-import android.widget.*;
 import java.util.ArrayList;
 import java.util.List;

--- a/engine/src/blender/com/jme3/asset/BlenderKey.java
+++ b/engine/src/blender/com/jme3/asset/BlenderKey.java
@ -31,13 +31,6 @@
 */
 package com.jme3.asset;

-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Queue;
-
-import org.lwjgl.opengl.GL11;
-
 import com.jme3.bounding.BoundingVolume;
 import com.jme3.collision.Collidable;
 import com.jme3.collision.CollisionResults;
@ -56,6 +49,11 @@ import com.jme3.scene.SceneGraphVisitor;
 import com.jme3.scene.Spatial;
 import com.jme3.scene.plugins.ogre.AnimData;
 import com.jme3.texture.Texture;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Queue;
+import org.lwjgl.opengl.GL11;

 /**
 * Blender key. Contains path of the blender file and its loading properties.
--- a/engine/src/blender/com/jme3/scene/plugins/blender/AbstractBlenderLoader.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/AbstractBlenderLoader.java
@ -31,10 +31,6 @@
 */
 package com.jme3.scene.plugins.blender;

-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.asset.AssetLoader;
 import com.jme3.asset.BlenderKey.FeaturesToLoad;
 import com.jme3.asset.BlenderKey.WorldData;
@ -52,6 +48,9 @@ import com.jme3.scene.plugins.blender.file.Structure;
 import com.jme3.scene.plugins.blender.lights.LightHelper;
 import com.jme3.scene.plugins.blender.meshes.MeshHelper;
 import com.jme3.scene.plugins.blender.objects.ObjectHelper;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;

 /**
 * This class converts blender file blocks into jMonkeyEngine data structures.
--- a/engine/src/blender/com/jme3/scene/plugins/blender/BlenderContext.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/BlenderContext.java
@ -31,16 +31,6 @@
 */
 package com.jme3.scene.plugins.blender;

-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.EmptyStackException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Stack;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.animation.Skeleton;
 import com.jme3.asset.AssetManager;
 import com.jme3.asset.BlenderKey;
@ -56,6 +46,15 @@ import com.jme3.scene.plugins.blender.file.Structure;
 import com.jme3.scene.plugins.blender.meshes.MeshContext;
 import com.jme3.scene.plugins.blender.modifiers.Modifier;
 import com.jme3.scene.plugins.ogre.AnimData;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.EmptyStackException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Stack;
+import java.util.logging.Level;
+import java.util.logging.Logger;

 /**
 * The class that stores temporary data and manages it during loading the belnd
--- a/engine/src/blender/com/jme3/scene/plugins/blender/animations/ArmatureHelper.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/animations/ArmatureHelper.java
@ -31,13 +31,6 @@
 */
 package com.jme3.scene.plugins.blender.animations;

-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.animation.Bone;
 import com.jme3.animation.BoneTrack;
 import com.jme3.animation.Skeleton;
@ -48,6 +41,12 @@ import com.jme3.scene.plugins.blender.curves.BezierCurve;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.Pointer;
 import com.jme3.scene.plugins.blender.file.Structure;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;

 /**
 * This class defines the methods to calculate certain aspects of animation and
--- a/engine/src/blender/com/jme3/scene/plugins/blender/animations/BoneContext.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/animations/BoneContext.java
@ -1,9 +1,5 @@
 package com.jme3.scene.plugins.blender.animations;

-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
 import com.jme3.animation.Bone;
 import com.jme3.math.Matrix4f;
 import com.jme3.math.Quaternion;
@ -14,6 +10,9 @@ import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.DynamicArray;
 import com.jme3.scene.plugins.blender.file.Structure;
 import com.jme3.scene.plugins.blender.objects.ObjectHelper;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;

 /**
 * This class holds the basic data that describes a bone.
--- a/engine/src/blender/com/jme3/scene/plugins/blender/animations/IpoHelper.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/animations/IpoHelper.java
@ -1,7 +1,5 @@
 package com.jme3.scene.plugins.blender.animations;

-import java.util.List;
-
 import com.jme3.animation.BoneTrack;
 import com.jme3.scene.plugins.blender.AbstractBlenderHelper;
 import com.jme3.scene.plugins.blender.BlenderContext;
@ -11,6 +9,7 @@ import com.jme3.scene.plugins.blender.file.BlenderInputStream;
 import com.jme3.scene.plugins.blender.file.FileBlockHeader;
 import com.jme3.scene.plugins.blender.file.Pointer;
 import com.jme3.scene.plugins.blender.file.Structure;
+import java.util.List;

 /**
 * This class helps to compute values from interpolation curves for features
--- a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/BlenderTrack.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/BlenderTrack.java
@ -1,7 +1,5 @@
 package com.jme3.scene.plugins.blender.constraints;

-import java.io.IOException;
-
 import com.jme3.animation.AnimChannel;
 import com.jme3.animation.AnimControl;
 import com.jme3.animation.BoneTrack;
@ -12,6 +10,7 @@ import com.jme3.export.JmeImporter;
 import com.jme3.math.Quaternion;
 import com.jme3.math.Vector3f;
 import com.jme3.util.TempVars;
+import java.io.IOException;

 /**
 * This class holds either the bone track or spatial track. Is made to improve
--- a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintDampTrack.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintDampTrack.java
@ -1,12 +1,11 @@
 package com.jme3.scene.plugins.blender.constraints;

-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.animations.Ipo;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.Structure;
+import java.util.logging.Level;
+import java.util.logging.Logger;

 /**
 * The damp track constraint. Available for blender 2.50+.
--- a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintHelper.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintHelper.java
@ -1,12 +1,5 @@
 package com.jme3.scene.plugins.blender.constraints;

-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Logger;
-
 import com.jme3.scene.plugins.blender.AbstractBlenderHelper;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.animations.Ipo;
@ -14,6 +7,12 @@ import com.jme3.scene.plugins.blender.animations.IpoHelper;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.Pointer;
 import com.jme3.scene.plugins.blender.file.Structure;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Logger;

 /**
 * This class should be used for constraint calculations.
--- a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintPivot.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintPivot.java
@ -1,12 +1,11 @@
 package com.jme3.scene.plugins.blender.constraints;

-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.animations.Ipo;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.Structure;
+import java.util.logging.Level;
+import java.util.logging.Logger;

 /**
 * The pivot constraint. Available for blender 2.50+.
--- a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintShrinkWrap.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintShrinkWrap.java
@ -1,9 +1,5 @@
 package com.jme3.scene.plugins.blender.constraints;

-import java.nio.FloatBuffer;
-import java.util.ArrayList;
-import java.util.List;
-
 import com.jme3.animation.Animation;
 import com.jme3.math.Quaternion;
 import com.jme3.math.Vector3f;
@ -17,6 +13,9 @@ import com.jme3.scene.plugins.blender.animations.Ipo;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.Structure;
 import com.jme3.scene.plugins.ogre.AnimData;
+import java.nio.FloatBuffer;
+import java.util.ArrayList;
+import java.util.List;

 /**
 * This class represents 'Shrink wrap' constraint type in blender.
--- a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintSplineInverseKinematic.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintSplineInverseKinematic.java
@ -1,12 +1,11 @@
 package com.jme3.scene.plugins.blender.constraints;

-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.animations.Ipo;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.Structure;
+import java.util.logging.Level;
+import java.util.logging.Logger;

 /**
 * The spline inverse kinematic constraint. Available for blender 2.50+.
--- a/engine/src/blender/com/jme3/scene/plugins/blender/curves/CurvesHelper.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/curves/CurvesHelper.java
@ -2,8 +2,8 @@ package com.jme3.scene.plugins.blender.curves;

 import com.jme3.material.Material;
 import com.jme3.material.RenderState.FaceCullMode;
-import com.jme3.math.Spline.SplineType;
 import com.jme3.math.*;
+import com.jme3.math.Spline.SplineType;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Mesh;
 import com.jme3.scene.VertexBuffer.Type;
--- a/engine/src/blender/com/jme3/scene/plugins/blender/materials/MaterialContext.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/materials/MaterialContext.java
@ -1,12 +1,5 @@
 package com.jme3.scene.plugins.blender.materials;

-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.logging.Logger;
-
 import com.jme3.material.Material;
 import com.jme3.material.RenderState.BlendMode;
 import com.jme3.material.RenderState.FaceCullMode;
@ -30,6 +23,12 @@ import com.jme3.scene.plugins.blender.textures.blending.TextureBlender;
 import com.jme3.scene.plugins.blender.textures.blending.TextureBlenderFactory;
 import com.jme3.texture.Texture;
 import com.jme3.util.BufferUtils;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.logging.Logger;

 /**
 * This class holds the data about the material.
--- a/engine/src/blender/com/jme3/scene/plugins/blender/materials/MaterialHelper.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/materials/MaterialHelper.java
@ -31,14 +31,6 @@
 */
 package com.jme3.scene.plugins.blender.materials;

-import java.nio.ByteBuffer;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.asset.BlenderKey.FeaturesToLoad;
 import com.jme3.material.MatParam;
 import com.jme3.material.MatParamTexture;
@ -56,6 +48,13 @@ import com.jme3.texture.Image;
 import com.jme3.texture.Image.Format;
 import com.jme3.texture.Texture;
 import com.jme3.util.BufferUtils;
+import java.nio.ByteBuffer;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.logging.Level;
+import java.util.logging.Logger;

 public class MaterialHelper extends AbstractBlenderHelper {
 	private static final Logger					LOGGER					= Logger.getLogger(MaterialHelper.class.getName());
--- a/engine/src/blender/com/jme3/scene/plugins/blender/meshes/MeshHelper.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/meshes/MeshHelper.java
@ -31,14 +31,6 @@
 */
 package com.jme3.scene.plugins.blender.meshes;

-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
 import com.jme3.asset.BlenderKey.FeaturesToLoad;
 import com.jme3.math.FastMath;
 import com.jme3.math.Vector2f;
@ -62,6 +54,13 @@ import com.jme3.scene.plugins.blender.objects.Properties;
 import com.jme3.scene.plugins.blender.textures.TextureHelper;
 import com.jme3.texture.Texture;
 import com.jme3.util.BufferUtils;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;

 /**
 * A class that is used in mesh calculations.
--- a/engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ArmatureModifier.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ArmatureModifier.java
@ -1,14 +1,5 @@
 package com.jme3.scene.plugins.blender.modifiers;

-import java.nio.ByteBuffer;
-import java.nio.FloatBuffer;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.animation.AnimControl;
 import com.jme3.animation.Animation;
 import com.jme3.animation.Bone;
@ -35,6 +26,14 @@ import com.jme3.scene.plugins.blender.meshes.MeshContext;
 import com.jme3.scene.plugins.blender.objects.ObjectHelper;
 import com.jme3.scene.plugins.ogre.AnimData;
 import com.jme3.util.BufferUtils;
+import java.nio.ByteBuffer;
+import java.nio.FloatBuffer;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;

 /**
 * This modifier allows to add bone animation to the object.
--- a/engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ModifierHelper.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ModifierHelper.java
@ -31,12 +31,6 @@
 */
 package com.jme3.scene.plugins.blender.modifiers;

-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.scene.plugins.blender.AbstractBlenderHelper;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.animations.Ipo;
@ -44,6 +38,11 @@ import com.jme3.scene.plugins.blender.animations.IpoHelper;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.Pointer;
 import com.jme3.scene.plugins.blender.file.Structure;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;

 /**
 * A class that is used in modifiers calculations.
--- a/engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ObjectAnimationModifier.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ObjectAnimationModifier.java
@ -1,10 +1,5 @@
 package com.jme3.scene.plugins.blender.modifiers;

-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.animation.AnimControl;
 import com.jme3.animation.Animation;
 import com.jme3.animation.SpatialTrack;
@ -13,6 +8,10 @@ import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.animations.Ipo;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
 import com.jme3.scene.plugins.ogre.AnimData;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.logging.Level;
+import java.util.logging.Logger;

 /**
 * This modifier allows to add animation to the object.
--- a/engine/src/blender/com/jme3/scene/plugins/blender/objects/ObjectHelper.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/objects/ObjectHelper.java
@ -31,12 +31,6 @@
 */
 package com.jme3.scene.plugins.blender.objects;

-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.asset.BlenderKey.FeaturesToLoad;
 import com.jme3.export.Savable;
 import com.jme3.light.DirectionalLight;
@ -67,6 +61,11 @@ import com.jme3.scene.plugins.blender.lights.LightHelper;
 import com.jme3.scene.plugins.blender.meshes.MeshHelper;
 import com.jme3.scene.plugins.blender.modifiers.Modifier;
 import com.jme3.scene.plugins.blender.modifiers.ModifierHelper;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;

 /**
 * A class that is used in object calculations.
--- a/engine/src/blender/com/jme3/scene/plugins/blender/objects/Properties.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/objects/Properties.java
@ -1,16 +1,15 @@
 package com.jme3.scene.plugins.blender.objects;

-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.BlenderInputStream;
 import com.jme3.scene.plugins.blender.file.FileBlockHeader;
 import com.jme3.scene.plugins.blender.file.Pointer;
 import com.jme3.scene.plugins.blender.file.Structure;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;

 /**
 * The blender object's custom properties.
--- a/engine/src/blender/com/jme3/scene/plugins/blender/textures/ColorBand.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/textures/ColorBand.java
@ -1,16 +1,15 @@
 package com.jme3.scene.plugins.blender.textures;

-import java.util.Map;
-import java.util.TreeMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.math.FastMath;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.DynamicArray;
 import com.jme3.scene.plugins.blender.file.Pointer;
 import com.jme3.scene.plugins.blender.file.Structure;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.logging.Level;
+import java.util.logging.Logger;

 /**
 * A class constaining the colorband data.
--- a/engine/src/blender/com/jme3/scene/plugins/blender/textures/CombinedTexture.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/textures/CombinedTexture.java
@ -1,13 +1,5 @@
 package com.jme3.scene.plugins.blender.textures;

-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
-import java.awt.image.BufferedImage;
-import java.util.ArrayList;
-import java.util.List;
-
-import jme3tools.converters.ImageToAwt;
-
 import com.jme3.math.Vector2f;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Mesh;
@ -26,6 +18,12 @@ import com.jme3.texture.Texture.MagFilter;
 import com.jme3.texture.Texture.MinFilter;
 import com.jme3.texture.Texture.WrapMode;
 import com.jme3.texture.Texture2D;
+import java.awt.Graphics2D;
+import java.awt.RenderingHints;
+import java.awt.image.BufferedImage;
+import java.util.ArrayList;
+import java.util.List;
+import jme3tools.converters.ImageToAwt;

 /**
 * This class represents a texture that is defined for the material. It can be
--- a/engine/src/blender/com/jme3/scene/plugins/blender/textures/GeneratedTexture.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/textures/GeneratedTexture.java
@ -1,10 +1,5 @@
 package com.jme3.scene.plugins.blender.textures;

-import java.util.Comparator;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-
 import com.jme3.bounding.BoundingBox;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Geometry;
@ -17,6 +12,10 @@ import com.jme3.scene.plugins.blender.textures.UVCoordinatesGenerator.UVCoordina
 import com.jme3.scene.plugins.blender.textures.generating.TextureGenerator;
 import com.jme3.texture.Image;
 import com.jme3.texture.Texture;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;

 /**
 * The generated texture loaded from blender file. The texture is not generated
--- a/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureHelper.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureHelper.java
@ -31,18 +31,6 @@
 */
 package com.jme3.scene.plugins.blender.textures;

-import java.awt.color.ColorSpace;
-import java.awt.image.BufferedImage;
-import java.awt.image.ColorConvertOp;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import jme3tools.converters.ImageToAwt;
-import jme3tools.converters.RGB565;
-
 import com.jme3.asset.AssetManager;
 import com.jme3.asset.AssetNotFoundException;
 import com.jme3.asset.BlenderKey;
@ -67,6 +55,16 @@ import com.jme3.texture.Texture.MinFilter;
 import com.jme3.texture.Texture.WrapMode;
 import com.jme3.texture.Texture2D;
 import com.jme3.util.BufferUtils;
+import java.awt.color.ColorSpace;
+import java.awt.image.BufferedImage;
+import java.awt.image.ColorConvertOp;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import jme3tools.converters.ImageToAwt;
+import jme3tools.converters.RGB565;

 /**
 * A class that is used in texture calculations.
--- a/engine/src/blender/com/jme3/scene/plugins/blender/textures/TriangulatedTexture.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/textures/TriangulatedTexture.java
@ -1,5 +1,18 @@
 package com.jme3.scene.plugins.blender.textures;

+import com.jme3.bounding.BoundingBox;
+import com.jme3.math.FastMath;
+import com.jme3.math.Vector2f;
+import com.jme3.math.Vector3f;
+import com.jme3.scene.plugins.blender.BlenderContext;
+import com.jme3.scene.plugins.blender.textures.blending.TextureBlender;
+import com.jme3.scene.plugins.blender.textures.io.PixelIOFactory;
+import com.jme3.scene.plugins.blender.textures.io.PixelInputOutput;
+import com.jme3.texture.Image;
+import com.jme3.texture.Image.Format;
+import com.jme3.texture.Texture;
+import com.jme3.texture.Texture2D;
+import com.jme3.util.BufferUtils;
 import java.awt.Graphics2D;
 import java.awt.RenderingHints;
 import java.awt.geom.AffineTransform;
@ -16,23 +29,8 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.TreeSet;
-
 import jme3tools.converters.ImageToAwt;

-import com.jme3.bounding.BoundingBox;
-import com.jme3.math.FastMath;
-import com.jme3.math.Vector2f;
-import com.jme3.math.Vector3f;
-import com.jme3.scene.plugins.blender.BlenderContext;
-import com.jme3.scene.plugins.blender.textures.blending.TextureBlender;
-import com.jme3.scene.plugins.blender.textures.io.PixelIOFactory;
-import com.jme3.scene.plugins.blender.textures.io.PixelInputOutput;
-import com.jme3.texture.Image;
-import com.jme3.texture.Image.Format;
-import com.jme3.texture.Texture;
-import com.jme3.texture.Texture2D;
-import com.jme3.util.BufferUtils;
-
 /**
 * This texture holds a set of images for each face in the specified mesh. It
 * helps to flatten 3D texture, merge 3D and 2D textures and merge 2D textures
--- a/engine/src/blender/com/jme3/scene/plugins/blender/textures/UVCoordinatesGenerator.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/textures/UVCoordinatesGenerator.java
@ -31,11 +31,6 @@
 */
 package com.jme3.scene.plugins.blender.textures;

-import java.nio.FloatBuffer;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Logger;
-
 import com.jme3.bounding.BoundingBox;
 import com.jme3.bounding.BoundingSphere;
 import com.jme3.bounding.BoundingVolume;
@ -46,6 +41,10 @@ import com.jme3.scene.Mesh;
 import com.jme3.scene.VertexBuffer;
 import com.jme3.scene.plugins.blender.textures.UVProjectionGenerator.UVProjectionType;
 import com.jme3.util.BufferUtils;
+import java.nio.FloatBuffer;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Logger;

 /**
 * This class is used for UV coordinates generation.
--- a/engine/src/blender/com/jme3/scene/plugins/blender/textures/blending/AbstractTextureBlender.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/textures/blending/AbstractTextureBlender.java
@ -1,12 +1,10 @@
 package com.jme3.scene.plugins.blender.textures.blending;

-import java.util.logging.Logger;
-
-import jme3tools.converters.MipMapGenerator;
-
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.materials.MaterialHelper;
 import com.jme3.texture.Image;
+import java.util.logging.Logger;
+import jme3tools.converters.MipMapGenerator;

 /**
 * An abstract class that contains the basic methods used by the classes that
--- a/engine/src/blender/com/jme3/scene/plugins/blender/textures/blending/TextureBlenderAWT.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/textures/blending/TextureBlenderAWT.java
@ -1,8 +1,5 @@
 package com.jme3.scene.plugins.blender.textures.blending;

-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-
 import com.jme3.math.FastMath;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.textures.TexturePixel;
@ -11,6 +8,8 @@ import com.jme3.scene.plugins.blender.textures.io.PixelInputOutput;
 import com.jme3.texture.Image;
 import com.jme3.texture.Image.Format;
 import com.jme3.util.BufferUtils;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;

 /**
 * The class that is responsible for blending the following texture types:
--- a/engine/src/blender/com/jme3/scene/plugins/blender/textures/blending/TextureBlenderDDS.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/textures/blending/TextureBlenderDDS.java
@ -1,10 +1,5 @@
 package com.jme3.scene.plugins.blender.textures.blending;

-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-
-import jme3tools.converters.RGB565;
-
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.textures.TexturePixel;
 import com.jme3.scene.plugins.blender.textures.io.PixelIOFactory;
@ -12,6 +7,9 @@ import com.jme3.scene.plugins.blender.textures.io.PixelInputOutput;
 import com.jme3.texture.Image;
 import com.jme3.texture.Image.Format;
 import com.jme3.util.BufferUtils;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import jme3tools.converters.RGB565;

 /**
 * The class that is responsible for blending the following texture types:
--- a/engine/src/blender/com/jme3/scene/plugins/blender/textures/blending/TextureBlenderFactory.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/textures/blending/TextureBlenderFactory.java
@ -31,12 +31,11 @@
 */
 package com.jme3.scene.plugins.blender.textures.blending;

-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.texture.Image;
 import com.jme3.texture.Image.Format;
+import java.util.logging.Level;
+import java.util.logging.Logger;

 /**
 * This class creates the texture blending class depending on the texture type.
--- a/engine/src/blender/com/jme3/scene/plugins/blender/textures/blending/TextureBlenderLuminance.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/textures/blending/TextureBlenderLuminance.java
@ -1,10 +1,5 @@
 package com.jme3.scene.plugins.blender.textures.blending;

-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.math.FastMath;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.textures.TexturePixel;
@ -13,6 +8,10 @@ import com.jme3.scene.plugins.blender.textures.io.PixelInputOutput;
 import com.jme3.texture.Image;
 import com.jme3.texture.Image.Format;
 import com.jme3.util.BufferUtils;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.logging.Level;
+import java.util.logging.Logger;

 /**
 * The class that is responsible for blending the following texture types:
--- a/engine/src/blender/com/jme3/scene/plugins/blender/textures/generating/NoiseGenerator.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/textures/generating/NoiseGenerator.java
@ -36,7 +36,6 @@ import com.jme3.scene.plugins.blender.AbstractBlenderHelper;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.file.Structure;
 import com.jme3.scene.plugins.blender.textures.generating.TextureGeneratorMusgrave.MusgraveData;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.ObjectInputStream;
--- a/engine/src/blender/com/jme3/scene/plugins/blender/textures/io/AWTPixelInputOutput.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/textures/io/AWTPixelInputOutput.java
@ -1,12 +1,10 @@
 package com.jme3.scene.plugins.blender.textures.io;

-import java.nio.ByteBuffer;
-
-import jme3tools.converters.RGB565;
-
 import com.jme3.math.FastMath;
 import com.jme3.scene.plugins.blender.textures.TexturePixel;
 import com.jme3.texture.Image;
+import java.nio.ByteBuffer;
+import jme3tools.converters.RGB565;

 /**
 * Implemens read/write operations for AWT images.
--- a/engine/src/blender/com/jme3/scene/plugins/blender/textures/io/DDSPixelInputOutput.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/textures/io/DDSPixelInputOutput.java
@ -1,12 +1,10 @@
 package com.jme3.scene.plugins.blender.textures.io;

-import java.nio.ByteBuffer;
-
-import jme3tools.converters.RGB565;
-
 import com.jme3.math.FastMath;
 import com.jme3.scene.plugins.blender.textures.TexturePixel;
 import com.jme3.texture.Image;
+import java.nio.ByteBuffer;
+import jme3tools.converters.RGB565;

 /**
 * Implemens read/write operations for DDS images.
--- a/engine/src/blender/com/jme3/scene/plugins/blender/textures/io/LuminancePixelInputOutput.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/textures/io/LuminancePixelInputOutput.java
@ -1,10 +1,9 @@
 package com.jme3.scene.plugins.blender.textures.io;

-import java.nio.ByteBuffer;
-
 import com.jme3.math.FastMath;
 import com.jme3.scene.plugins.blender.textures.TexturePixel;
 import com.jme3.texture.Image;
+import java.nio.ByteBuffer;

 /**
 * Implemens read/write operations for luminance images.
--- a/engine/src/blender/com/jme3/scene/plugins/blender/textures/io/PixelIOFactory.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/textures/io/PixelIOFactory.java
@ -1,10 +1,9 @@
 package com.jme3.scene.plugins.blender.textures.io;

+import com.jme3.texture.Image.Format;
 import java.util.HashMap;
 import java.util.Map;

-import com.jme3.texture.Image.Format;
-
 /**
 * This class creates a pixel IO object for the specified image format.
 * 
--- a/engine/src/core-effects/com/jme3/post/filters/TranslucentBucketFilter.java
+++ b/engine/src/core-effects/com/jme3/post/filters/TranslucentBucketFilter.java
@ -14,7 +14,6 @@ import com.jme3.renderer.Renderer;
 import com.jme3.renderer.ViewPort;
 import com.jme3.renderer.queue.RenderQueue;
 import com.jme3.scene.Node;
-
 import com.jme3.scene.Spatial;
 import com.jme3.texture.FrameBuffer;
 import com.jme3.texture.Texture;
--- a/engine/src/core-plugins/com/jme3/material/plugins/J3MLoader.java
+++ b/engine/src/core-plugins/com/jme3/material/plugins/J3MLoader.java
@ -33,9 +33,9 @@
 package com.jme3.material.plugins;

 import com.jme3.asset.*;
+import com.jme3.material.*;
 import com.jme3.material.RenderState.BlendMode;
 import com.jme3.material.RenderState.FaceCullMode;
-import com.jme3.material.*;
 import com.jme3.material.TechniqueDef.LightMode;
 import com.jme3.material.TechniqueDef.ShadowMode;
 import com.jme3.math.ColorRGBA;
--- a/engine/src/core-plugins/com/jme3/scene/plugins/OBJLoader.java
+++ b/engine/src/core-plugins/com/jme3/scene/plugins/OBJLoader.java
@ -38,8 +38,8 @@ import com.jme3.material.MaterialList;
 import com.jme3.math.Vector2f;
 import com.jme3.math.Vector3f;
 import com.jme3.renderer.queue.RenderQueue.Bucket;
-import com.jme3.scene.Mesh.Mode;
 import com.jme3.scene.*;
+import com.jme3.scene.Mesh.Mode;
 import com.jme3.scene.VertexBuffer.Type;
 import com.jme3.scene.mesh.IndexBuffer;
 import com.jme3.scene.mesh.IndexIntBuffer;
@ -52,8 +52,8 @@ import java.io.InputStream;
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
 import java.nio.ShortBuffer;
-import java.util.Map.Entry;
 import java.util.*;
+import java.util.Map.Entry;
 import java.util.logging.Level;
 import java.util.logging.Logger;

--- a/engine/src/core/checkers/quals/Unused.java
+++ b/engine/src/core/checkers/quals/Unused.java
@ -1,7 +1,7 @@
 package checkers.quals;

-import static java.lang.annotation.ElementType.FIELD;
 import java.lang.annotation.*;
+import static java.lang.annotation.ElementType.FIELD;

 /**
 * Declares that the field may not be accessed if the receiver is of the
--- a/engine/src/core/com/jme3/app/Application.java
+++ b/engine/src/core/com/jme3/app/Application.java
@ -43,8 +43,8 @@ import com.jme3.renderer.Camera;
 import com.jme3.renderer.RenderManager;
 import com.jme3.renderer.Renderer;
 import com.jme3.renderer.ViewPort;
-import com.jme3.system.JmeContext.Type;
 import com.jme3.system.*;
+import com.jme3.system.JmeContext.Type;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.concurrent.Callable;
--- a/engine/src/core/com/jme3/app/SimpleApplication.java
+++ b/engine/src/core/com/jme3/app/SimpleApplication.java
@ -38,8 +38,6 @@ import com.jme3.input.FlyByCamera;
 import com.jme3.input.KeyInput;
 import com.jme3.input.controls.ActionListener;
 import com.jme3.input.controls.KeyTrigger;
-import com.jme3.math.Quaternion;
-import com.jme3.math.Vector3f;
 import com.jme3.renderer.RenderManager;
 import com.jme3.renderer.queue.RenderQueue.Bucket;
 import com.jme3.scene.Node;
@ -47,7 +45,6 @@ import com.jme3.scene.Spatial.CullHint;
 import com.jme3.system.AppSettings;
 import com.jme3.system.JmeContext.Type;
 import com.jme3.system.JmeSystem;
-import com.jme3.util.BufferUtils;

 /**
 * <code>SimpleApplication</code> extends the {@link com.jme3.app.Application}
--- a/engine/src/core/com/jme3/app/StatsAppState.java
+++ b/engine/src/core/com/jme3/app/StatsAppState.java
@ -35,7 +35,6 @@ import com.jme3.app.state.AbstractAppState;
 import com.jme3.app.state.AppStateManager;
 import com.jme3.font.BitmapFont;
 import com.jme3.font.BitmapText;
-import com.jme3.renderer.RenderManager;
 import com.jme3.scene.Node;
 import com.jme3.scene.Spatial.CullHint;

--- a/engine/src/core/com/jme3/asset/AssetConfig.java
+++ b/engine/src/core/com/jme3/asset/AssetConfig.java
@ -32,7 +32,6 @@

 package com.jme3.asset;

-import java.io.DataInput;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Scanner;
--- a/engine/src/core/com/jme3/cinematic/events/MotionTrack.java
+++ b/engine/src/core/com/jme3/cinematic/events/MotionTrack.java
@ -41,13 +41,11 @@ import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
 import com.jme3.export.OutputCapsule;
 import com.jme3.math.Quaternion;
-import com.jme3.math.Vector2f;
 import com.jme3.math.Vector3f;
 import com.jme3.renderer.RenderManager;
 import com.jme3.renderer.ViewPort;
 import com.jme3.scene.Spatial;
 import com.jme3.scene.control.Control;
-import com.jme3.util.TempVars;
 import java.io.IOException;

 /**
--- a/engine/src/core/com/jme3/material/Material.java
+++ b/engine/src/core/com/jme3/material/Material.java
@ -29,9 +29,9 @@
 */
 package com.jme3.material;

-import com.jme3.asset.CloneableSmartAsset;
 import com.jme3.asset.AssetKey;
 import com.jme3.asset.AssetManager;
+import com.jme3.asset.CloneableSmartAsset;
 import com.jme3.export.*;
 import com.jme3.light.*;
 import com.jme3.material.RenderState.BlendMode;
--- a/engine/src/core/com/jme3/renderer/RenderManager.java
+++ b/engine/src/core/com/jme3/renderer/RenderManager.java
@ -47,7 +47,6 @@ import com.jme3.shader.UniformBinding;
 import com.jme3.shader.VarType;
 import com.jme3.system.NullRenderer;
 import com.jme3.system.Timer;
-import com.jme3.util.IntMap.Entry;
 import com.jme3.util.TempVars;
 import java.util.ArrayList;
 import java.util.Collections;
--- a/engine/src/core/com/jme3/scene/AssetLinkNode.java
+++ b/engine/src/core/com/jme3/scene/AssetLinkNode.java
@ -42,8 +42,8 @@ import com.jme3.export.OutputCapsule;
 import com.jme3.export.binary.BinaryImporter;
 import com.jme3.util.SafeArrayList;
 import java.io.IOException;
-import java.util.Map.Entry;
 import java.util.*;
+import java.util.Map.Entry;
 import java.util.logging.Level;
 import java.util.logging.Logger;

--- a/engine/src/core/com/jme3/shadow/PssmShadowRenderer.java
+++ b/engine/src/core/com/jme3/shadow/PssmShadowRenderer.java
@ -31,7 +31,6 @@ package com.jme3.shadow;

 import com.jme3.asset.AssetManager;
 import com.jme3.material.Material;
-import com.jme3.material.RenderState;
 import com.jme3.math.ColorRGBA;
 import com.jme3.math.Matrix4f;
 import com.jme3.math.Vector3f;
--- a/engine/src/core/com/jme3/util/ListMap.java
+++ b/engine/src/core/com/jme3/util/ListMap.java
@ -33,8 +33,8 @@
 package com.jme3.util;

 import java.io.Serializable;
-import java.util.Map.Entry;
 import java.util.*;
+import java.util.Map.Entry;

 /**
 * Implementation of a Map that favors iteration speed rather than
--- a/engine/src/desktop/com/jme3/app/state/VideoRecorderAppState.java
+++ b/engine/src/desktop/com/jme3/app/state/VideoRecorderAppState.java
@ -1,8 +1,6 @@
 package com.jme3.app.state;

 import com.jme3.app.Application;
-import com.jme3.app.state.AbstractAppState;
-import com.jme3.app.state.AppStateManager;
 import com.jme3.post.SceneProcessor;
 import com.jme3.renderer.Camera;
 import com.jme3.renderer.RenderManager;
--- a/engine/src/jbullet/com/jme3/bullet/PhysicsSpace.java
+++ b/engine/src/jbullet/com/jme3/bullet/PhysicsSpace.java
@ -36,9 +36,9 @@ import com.bulletphysics.ContactAddedCallback;
 import com.bulletphysics.ContactDestroyedCallback;
 import com.bulletphysics.ContactProcessedCallback;
 import com.bulletphysics.collision.broadphase.*;
+import com.bulletphysics.collision.dispatch.*;
 import com.bulletphysics.collision.dispatch.CollisionWorld.LocalConvexResult;
 import com.bulletphysics.collision.dispatch.CollisionWorld.LocalRayResult;
-import com.bulletphysics.collision.dispatch.*;
 import com.bulletphysics.collision.narrowphase.ManifoldPoint;
 import com.bulletphysics.collision.shapes.ConvexShape;
 import com.bulletphysics.dynamics.DiscreteDynamicsWorld;
--- a/engine/src/lwjgl/com/jme3/audio/lwjgl/LwjglAudioRenderer.java
+++ b/engine/src/lwjgl/com/jme3/audio/lwjgl/LwjglAudioRenderer.java
@ -32,8 +32,8 @@

 package com.jme3.audio.lwjgl;

-import com.jme3.audio.AudioNode.Status;
 import com.jme3.audio.*;
+import com.jme3.audio.AudioNode.Status;
 import com.jme3.math.Vector3f;
 import com.jme3.util.BufferUtils;
 import com.jme3.util.NativeObjectManager;
@ -45,8 +45,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.lwjgl.LWJGLException;
-import static org.lwjgl.openal.AL10.*;
 import org.lwjgl.openal.*;
+import static org.lwjgl.openal.AL10.*;

 public class LwjglAudioRenderer implements AudioRenderer, Runnable {

--- a/engine/src/lwjgl/com/jme3/input/lwjgl/JInputJoyInput.java
+++ b/engine/src/lwjgl/com/jme3/input/lwjgl/JInputJoyInput.java
@ -8,11 +8,11 @@ import com.jme3.input.event.JoyAxisEvent;
 import com.jme3.input.event.JoyButtonEvent;
 import com.jme3.util.IntMap;
 import java.util.HashMap;
+import net.java.games.input.*;
 import net.java.games.input.Component.Identifier;
 import net.java.games.input.Component.Identifier.Axis;
 import net.java.games.input.Component.Identifier.Button;
 import net.java.games.input.Component.POV;
-import net.java.games.input.*;

 public class JInputJoyInput implements JoyInput {

--- a/engine/src/lwjgl/com/jme3/renderer/lwjgl/LwjglGL1Renderer.java
+++ b/engine/src/lwjgl/com/jme3/renderer/lwjgl/LwjglGL1Renderer.java
@ -23,8 +23,6 @@ import com.jme3.texture.Image;
 import com.jme3.texture.Texture;
 import com.jme3.texture.Texture.WrapAxis;
 import com.jme3.util.BufferUtils;
-import com.jme3.util.IntMap;
-import com.jme3.util.IntMap.Entry;
 import com.jme3.util.NativeObjectManager;
 import java.nio.*;
 import java.util.ArrayList;
--- a/engine/src/lwjgl/com/jme3/renderer/lwjgl/LwjglRenderer.java
+++ b/engine/src/lwjgl/com/jme3/renderer/lwjgl/LwjglRenderer.java
@ -53,7 +53,6 @@ import com.jme3.texture.FrameBuffer.RenderBuffer;
 import com.jme3.texture.Image;
 import com.jme3.texture.Texture;
 import com.jme3.texture.Texture.WrapAxis;
-import com.jme3.util.IntMap.Entry;
 import com.jme3.util.*;
 import java.nio.*;
 import java.util.EnumSet;
@ -62,6 +61,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import jme3tools.converters.MipMapGenerator;
 import jme3tools.shader.ShaderDebug;
+import org.lwjgl.opengl.*;
 import static org.lwjgl.opengl.ARBTextureMultisample.*;
 import static org.lwjgl.opengl.EXTFramebufferBlit.*;
 import static org.lwjgl.opengl.EXTFramebufferMultisample.*;
@ -72,7 +72,6 @@ import static org.lwjgl.opengl.GL13.*;
 import static org.lwjgl.opengl.GL14.*;
 import static org.lwjgl.opengl.GL15.*;
 import static org.lwjgl.opengl.GL20.*;
-import org.lwjgl.opengl.*;
 //import static org.lwjgl.opengl.ARBDrawInstanced.*;

 public class LwjglRenderer implements Renderer {
--- a/engine/src/networking/com/jme3/network/base/DefaultClient.java
+++ b/engine/src/networking/com/jme3/network/base/DefaultClient.java
@ -32,8 +32,8 @@

 package com.jme3.network.base;

-import com.jme3.network.ClientStateListener.DisconnectInfo;
 import com.jme3.network.*;
+import com.jme3.network.ClientStateListener.DisconnectInfo;
 import com.jme3.network.kernel.Connector;
 import com.jme3.network.message.ChannelInfoMessage;
 import com.jme3.network.message.ClientRegistrationMessage;
--- a/engine/src/networking/com/jme3/network/rmi/ObjectStore.java
+++ b/engine/src/networking/com/jme3/network/rmi/ObjectStore.java
@ -32,8 +32,8 @@

 package com.jme3.network.rmi;

-import com.jme3.network.ClientStateListener.DisconnectInfo;
 import com.jme3.network.*;
+import com.jme3.network.ClientStateListener.DisconnectInfo;
 import com.jme3.network.serializing.Serializer;
 import com.jme3.util.IntMap;
 import com.jme3.util.IntMap.Entry;
--- a/engine/src/networking/com/jme3/network/serializing/serializers/FieldSerializer.java
+++ b/engine/src/networking/com/jme3/network/serializing/serializers/FieldSerializer.java
@ -40,7 +40,6 @@ import java.lang.reflect.Modifier;
 import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;
 import java.util.*;
-import java.util.logging.Level;

 /**
 * The field serializer is the default serializer used for custom class.
--- a/engine/src/niftygui/com/jme3/cinematic/events/GuiTrack.java
+++ b/engine/src/niftygui/com/jme3/cinematic/events/GuiTrack.java
@ -38,7 +38,6 @@ import com.jme3.export.JmeImporter;
 import com.jme3.export.OutputCapsule;
 import de.lessvoid.nifty.Nifty;
 import de.lessvoid.nifty.screen.NullScreen;
-import de.lessvoid.nifty.screen.Screen;
 import java.io.IOException;

 /**
--- a/engine/src/niftygui/com/jme3/niftygui/InputSystemJme.java
+++ b/engine/src/niftygui/com/jme3/niftygui/InputSystemJme.java
@ -43,9 +43,9 @@ import de.lessvoid.nifty.NiftyInputConsumer;
 import de.lessvoid.nifty.controls.TextField;
 import de.lessvoid.nifty.controls.nullobjects.TextFieldNull;
 import de.lessvoid.nifty.elements.Element;
-import de.lessvoid.nifty.tools.resourceloader.NiftyResourceLoader;
 import de.lessvoid.nifty.input.keyboard.KeyboardInputEvent;
 import de.lessvoid.nifty.spi.input.InputSystem;
+import de.lessvoid.nifty.tools.resourceloader.NiftyResourceLoader;
 import java.util.ArrayList;
 import java.util.logging.Level;
 import java.util.logging.Logger;
--- a/engine/src/terrain/com/jme3/terrain/Terrain.java
+++ b/engine/src/terrain/com/jme3/terrain/Terrain.java
@ -34,7 +34,6 @@ package com.jme3.terrain;
 import com.jme3.material.Material;
 import com.jme3.math.Vector2f;
 import com.jme3.math.Vector3f;
-import com.jme3.terrain.geomipmap.lodcalc.LodCalculator;
 import java.util.List;

 /**
--- a/engine/src/terrain/com/jme3/terrain/geomipmap/LODGeomap.java
+++ b/engine/src/terrain/com/jme3/terrain/geomipmap/LODGeomap.java
@ -34,7 +34,6 @@ package com.jme3.terrain.geomipmap;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
 import com.jme3.math.FastMath;
-import com.jme3.math.Plane;
 import com.jme3.math.Triangle;
 import com.jme3.math.Vector2f;
 import com.jme3.math.Vector3f;
--- a/engine/src/terrain/com/jme3/terrain/geomipmap/grid/FractalTileLoader.java
+++ b/engine/src/terrain/com/jme3/terrain/geomipmap/grid/FractalTileLoader.java
@ -5,7 +5,6 @@
 package com.jme3.terrain.geomipmap.grid;


-import com.jme3.asset.AssetManager;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
 import com.jme3.math.Vector3f;
@ -13,9 +12,9 @@ import com.jme3.terrain.geomipmap.TerrainGridTileLoader;
 import com.jme3.terrain.geomipmap.TerrainQuad;
 import com.jme3.terrain.heightmap.AbstractHeightMap;
 import com.jme3.terrain.heightmap.HeightMap;
+import com.jme3.terrain.noise.Basis;
 import java.io.IOException;
 import java.nio.FloatBuffer;
-import com.jme3.terrain.noise.Basis;

 /**
 *
--- a/engine/src/terrain/com/jme3/terrain/heightmap/ImageBasedHeightMap.java
+++ b/engine/src/terrain/com/jme3/terrain/heightmap/ImageBasedHeightMap.java
@ -32,9 +32,9 @@

 package com.jme3.terrain.heightmap;

-import java.nio.ByteBuffer;
 import com.jme3.math.ColorRGBA;
 import com.jme3.texture.Image;
+import java.nio.ByteBuffer;
 import java.nio.ShortBuffer;

 /**
--- a/engine/src/terrain/com/jme3/terrain/heightmap/ImageHeightmap.java
+++ b/engine/src/terrain/com/jme3/terrain/heightmap/ImageHeightmap.java
@ -4,8 +4,6 @@
 */
 package com.jme3.terrain.heightmap;

-import com.jme3.texture.Image;
-
 /**
 * A heightmap that is built off an image.
 * If you want to be able to supply different Image types to 
--- a/engine/src/terrain/com/jme3/terrain/noise/Basis.java
+++ b/engine/src/terrain/com/jme3/terrain/noise/Basis.java
@ -29,10 +29,9 @@
 */
 package com.jme3.terrain.noise;

-import java.nio.FloatBuffer;
-
 import com.jme3.terrain.noise.basis.ImprovedNoise;
 import com.jme3.terrain.noise.modulator.Modulator;
+import java.nio.FloatBuffer;

 /**
 * Interface for - basically 3D - noise generation algorithms, based on the
--- a/engine/src/terrain/com/jme3/terrain/noise/basis/FilteredBasis.java
+++ b/engine/src/terrain/com/jme3/terrain/noise/basis/FilteredBasis.java
@ -29,13 +29,12 @@
 */
 package com.jme3.terrain.noise.basis;

-import java.nio.FloatBuffer;
-import java.util.ArrayList;
-import java.util.List;
-
 import com.jme3.terrain.noise.Basis;
 import com.jme3.terrain.noise.filter.AbstractFilter;
 import com.jme3.terrain.noise.modulator.Modulator;
+import java.nio.FloatBuffer;
+import java.util.ArrayList;
+import java.util.List;

 public class FilteredBasis extends AbstractFilter implements Basis {

--- a/engine/src/terrain/com/jme3/terrain/noise/basis/Noise.java
+++ b/engine/src/terrain/com/jme3/terrain/noise/basis/Noise.java
@ -29,13 +29,12 @@
 */
 package com.jme3.terrain.noise.basis;

-import java.nio.FloatBuffer;
-import java.util.ArrayList;
-import java.util.List;
-
 import com.jme3.terrain.noise.Basis;
 import com.jme3.terrain.noise.modulator.Modulator;
 import com.jme3.terrain.noise.modulator.NoiseModulator;
+import java.nio.FloatBuffer;
+import java.util.ArrayList;
+import java.util.List;

 /**
 * Utility base class for Noise implementations
--- a/engine/src/terrain/com/jme3/terrain/noise/filter/AbstractFilter.java
+++ b/engine/src/terrain/com/jme3/terrain/noise/filter/AbstractFilter.java
@ -29,12 +29,11 @@
 */
 package com.jme3.terrain.noise.filter;

+import com.jme3.terrain.noise.Filter;
 import java.nio.FloatBuffer;
 import java.util.ArrayList;
 import java.util.List;

-import com.jme3.terrain.noise.Filter;
-
 public abstract class AbstractFilter implements Filter {

 	protected List<Filter> preFilters = new ArrayList<Filter>();
--- a/engine/src/terrain/com/jme3/terrain/noise/filter/HydraulicErodeFilter.java
+++ b/engine/src/terrain/com/jme3/terrain/noise/filter/HydraulicErodeFilter.java
@ -29,9 +29,8 @@
 */
 package com.jme3.terrain.noise.filter;

-import java.nio.FloatBuffer;
-
 import com.jme3.terrain.noise.Basis;
+import java.nio.FloatBuffer;

 public class HydraulicErodeFilter extends AbstractFilter {

--- a/engine/src/terrain/com/jme3/terrain/noise/filter/IterativeFilter.java
+++ b/engine/src/terrain/com/jme3/terrain/noise/filter/IterativeFilter.java
@ -29,12 +29,11 @@
 */
 package com.jme3.terrain.noise.filter;

+import com.jme3.terrain.noise.Filter;
 import java.nio.FloatBuffer;
 import java.util.ArrayList;
 import java.util.List;

-import com.jme3.terrain.noise.Filter;
-
 public class IterativeFilter extends AbstractFilter {

 	private int iterations;
--- a/engine/src/terrain/com/jme3/terrain/noise/filter/PerturbFilter.java
+++ b/engine/src/terrain/com/jme3/terrain/noise/filter/PerturbFilter.java
@ -29,11 +29,10 @@
 */
 package com.jme3.terrain.noise.filter;

-import java.nio.FloatBuffer;
-import java.util.logging.Logger;
-
 import com.jme3.terrain.noise.ShaderUtils;
 import com.jme3.terrain.noise.fractal.FractalSum;
+import java.nio.FloatBuffer;
+import java.util.logging.Logger;

 public class PerturbFilter extends AbstractFilter {

--- a/engine/src/terrain/com/jme3/terrain/noise/modulator/CatRom2.java
+++ b/engine/src/terrain/com/jme3/terrain/noise/modulator/CatRom2.java
@ -29,11 +29,10 @@
 */
 package com.jme3.terrain.noise.modulator;

+import com.jme3.terrain.noise.ShaderUtils;
 import java.util.HashMap;
 import java.util.Map;

-import com.jme3.terrain.noise.ShaderUtils;
-
 public class CatRom2 implements Modulator {

 	private int sampleRate = 100;
--- a/engine/src/test/jme3test/animation/TestCinematic.java
+++ b/engine/src/test/jme3test/animation/TestCinematic.java
@ -47,7 +47,6 @@ import com.jme3.light.DirectionalLight;
 import com.jme3.material.Material;
 import com.jme3.math.ColorRGBA;
 import com.jme3.math.FastMath;
-import com.jme3.math.Quaternion;
 import com.jme3.math.Vector3f;
 import com.jme3.niftygui.NiftyJmeDisplay;
 import com.jme3.post.FilterPostProcessor;
--- a/engine/src/test/jme3test/audio/TestMusicPlayer.java
+++ b/engine/src/test/jme3test/audio/TestMusicPlayer.java
@ -34,8 +34,8 @@ package jme3test.audio;

 import com.jme3.asset.AssetInfo;
 import com.jme3.asset.AssetLoader;
-import com.jme3.audio.AudioNode.Status;
 import com.jme3.audio.*;
+import com.jme3.audio.AudioNode.Status;
 import com.jme3.audio.plugins.OGGLoader;
 import com.jme3.audio.plugins.WAVLoader;
 import com.jme3.system.AppSettings;
--- a/engine/src/test/jme3test/games/CubeField.java
+++ b/engine/src/test/jme3test/games/CubeField.java
@ -46,7 +46,6 @@ import com.jme3.math.Quaternion;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Node;
-import com.jme3.scene.Spatial.CullHint;
 import com.jme3.scene.shape.Box;
 import com.jme3.scene.shape.Dome;
 import java.util.ArrayList;
--- a/engine/src/test/jme3test/input/TestJoystick.java
+++ b/engine/src/test/jme3test/input/TestJoystick.java
@ -5,7 +5,6 @@ import com.jme3.input.JoyInput;
 import com.jme3.input.Joystick;
 import com.jme3.input.controls.ActionListener;
 import com.jme3.input.controls.AnalogListener;
-import com.jme3.input.controls.JoyAxisTrigger;
 import com.jme3.system.AppSettings;

 public class TestJoystick extends SimpleApplication implements AnalogListener, ActionListener {
--- a/engine/src/test/jme3test/input/combomoves/TestComboMoves.java
+++ b/engine/src/test/jme3test/input/combomoves/TestComboMoves.java
@ -38,7 +38,6 @@ import com.jme3.input.KeyInput;
 import com.jme3.input.controls.ActionListener;
 import com.jme3.input.controls.KeyTrigger;
 import com.jme3.math.ColorRGBA;
-import com.jme3.scene.Spatial.CullHint;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
--- a/engine/src/test/jme3test/light/TestSpotLightTerrain.java
+++ b/engine/src/test/jme3test/light/TestSpotLightTerrain.java
@ -52,7 +52,6 @@ import com.jme3.terrain.heightmap.ImageBasedHeightMap;
 import com.jme3.texture.Texture;
 import com.jme3.texture.Texture.WrapMode;
 import com.jme3.util.SkyFactory;
-import jme3tools.converters.ImageToAwt;

 /**
 * Uses the terrain's lighting texture with normal maps and lights.
--- a/engine/src/test/jme3test/material/TestMaterialCompare.java
+++ b/engine/src/test/jme3test/material/TestMaterialCompare.java
@ -32,7 +32,6 @@
 package jme3test.material;

 import com.jme3.asset.AssetManager;
-import com.jme3.asset.GeneratedTextureKey;
 import com.jme3.asset.TextureKey;
 import com.jme3.material.Material;
 import com.jme3.material.RenderState.BlendMode;
--- a/engine/src/test/jme3test/model/anim/TestOgreAnim.java
+++ b/engine/src/test/jme3test/model/anim/TestOgreAnim.java
@ -51,6 +51,7 @@ public class TestOgreAnim extends SimpleApplication

    private AnimChannel channel;
    private AnimControl control;
+    private Geometry geom;

    public static void main(String[] args) {
        TestOgreAnim app = new TestOgreAnim();
@ -79,7 +80,7 @@ public class TestOgreAnim extends SimpleApplication
            System.out.println(anim);

        channel.setAnim("stand");
-
+        geom = (Geometry)((Node)model).getChild(0);
        SkeletonControl skeletonControl = model.getControl(SkeletonControl.class);

        Box b = new Box(.25f,3f,.25f);
@ -95,6 +96,14 @@ public class TestOgreAnim extends SimpleApplication
        inputManager.addMapping("Attack", new KeyTrigger(KeyInput.KEY_SPACE));
    }

+    @Override
+    public void simpleUpdate(float tpf) {
+        super.simpleUpdate(tpf);
+//                        geom.getMesh().createCollisionData();
+
+    }
+    
+
    public void onAnimCycleDone(AnimControl control, AnimChannel channel, String animName) {
        if (animName.equals("Dodge")){
            channel.setAnim("stand", 0.50f);
--- a/engine/src/test/jme3test/post/TestLightScattering.java
+++ b/engine/src/test/jme3test/post/TestLightScattering.java
@ -33,8 +33,6 @@
 package jme3test.post;

 import com.jme3.app.SimpleApplication;
-import com.jme3.app.StatsView;
-import com.jme3.font.BitmapText;
 import com.jme3.light.DirectionalLight;
 import com.jme3.material.Material;
 import com.jme3.math.ColorRGBA;
--- a/engine/src/test/jme3test/terrain/TerrainGridAlphaMapTest.java
+++ b/engine/src/test/jme3test/terrain/TerrainGridAlphaMapTest.java
@ -18,7 +18,6 @@ import com.jme3.material.Material;
 import com.jme3.math.ColorRGBA;
 import com.jme3.math.Vector2f;
 import com.jme3.math.Vector3f;
-import com.jme3.renderer.Camera;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
@ -30,11 +29,6 @@ import com.jme3.terrain.geomipmap.TerrainLodControl;
 import com.jme3.terrain.geomipmap.TerrainQuad;
 import com.jme3.terrain.geomipmap.grid.FractalTileLoader;
 import com.jme3.terrain.geomipmap.lodcalc.DistanceLodCalculator;
-import com.jme3.texture.Texture;
-import com.jme3.texture.Texture.WrapMode;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
 import com.jme3.terrain.noise.ShaderUtils;
 import com.jme3.terrain.noise.basis.FilteredBasis;
 import com.jme3.terrain.noise.filter.IterativeFilter;
@ -43,6 +37,9 @@ import com.jme3.terrain.noise.filter.PerturbFilter;
 import com.jme3.terrain.noise.filter.SmoothFilter;
 import com.jme3.terrain.noise.fractal.FractalSum;
 import com.jme3.terrain.noise.modulator.NoiseModulator;
+import com.jme3.texture.Texture;
+import com.jme3.texture.Texture.WrapMode;
+import java.io.File;

 public class TerrainGridAlphaMapTest extends SimpleApplication {

--- a/engine/src/test/jme3test/terrain/TerrainTest.java
+++ b/engine/src/test/jme3test/terrain/TerrainTest.java
@ -49,7 +49,6 @@ import com.jme3.terrain.heightmap.AbstractHeightMap;
 import com.jme3.terrain.heightmap.ImageBasedHeightMap;
 import com.jme3.texture.Texture;
 import com.jme3.texture.Texture.WrapMode;
-import com.jme3.asset.TextureKey;

 /**
 * Demonstrates how to use terrain.
--- a/engine/src/test/jme3test/terrain/TerrainTestAdvanced.java
+++ b/engine/src/test/jme3test/terrain/TerrainTestAdvanced.java
@ -43,7 +43,9 @@ import com.jme3.material.Material;
 import com.jme3.math.ColorRGBA;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Geometry;
+import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
+import com.jme3.scene.debug.Arrow;
 import com.jme3.terrain.geomipmap.TerrainLodControl;
 import com.jme3.terrain.geomipmap.TerrainQuad;
 import com.jme3.terrain.geomipmap.lodcalc.DistanceLodCalculator;
@ -52,8 +54,6 @@ import com.jme3.terrain.heightmap.ImageBasedHeightMap;
 import com.jme3.texture.Texture;
 import com.jme3.texture.Texture.WrapMode;
 import com.jme3.util.SkyFactory;
-import com.jme3.scene.Node;
-import com.jme3.scene.debug.Arrow;

 /**
 * Uses the terrain's lighting texture with normal maps and lights.
--- a/engine/src/test/jme3test/terrain/TerrainTestCollision.java
+++ b/engine/src/test/jme3test/terrain/TerrainTestCollision.java
@ -31,7 +31,6 @@
 */
 package jme3test.terrain;

-import com.jme3.bullet.collision.shapes.SphereCollisionShape;
 import com.jme3.app.SimpleApplication;
 import com.jme3.bounding.BoundingBox;
 import com.jme3.bullet.BulletAppState;
@ -63,7 +62,6 @@ import com.jme3.terrain.heightmap.AbstractHeightMap;
 import com.jme3.terrain.heightmap.ImageBasedHeightMap;
 import com.jme3.texture.Texture;
 import com.jme3.texture.Texture.WrapMode;
-import jme3tools.converters.ImageToAwt;

 /**
 * Creates a terrain object and a collision node to go with it. Then
--- a/engine/src/tools/jme3tools/converters/model/ModelConverter.java
+++ b/engine/src/tools/jme3tools/converters/model/ModelConverter.java
@ -32,8 +32,8 @@

 package jme3tools.converters.model;

-import com.jme3.scene.Mesh.Mode;
 import com.jme3.scene.*;
+import com.jme3.scene.Mesh.Mode;
 import com.jme3.scene.VertexBuffer.Format;
 import com.jme3.scene.VertexBuffer.Type;
 import com.jme3.scene.mesh.IndexBuffer;
--- a/engine/src/tools/jme3tools/optimize/GeometryBatchFactory.java
+++ b/engine/src/tools/jme3tools/optimize/GeometryBatchFactory.java
@ -4,14 +4,13 @@ import com.jme3.material.Material;
 import com.jme3.math.Matrix4f;
 import com.jme3.math.Transform;
 import com.jme3.math.Vector3f;
-import com.jme3.scene.Mesh.Mode;
 import com.jme3.scene.*;
+import com.jme3.scene.Mesh.Mode;
 import com.jme3.scene.VertexBuffer.Format;
 import com.jme3.scene.VertexBuffer.Type;
 import com.jme3.scene.VertexBuffer.Usage;
 import com.jme3.scene.mesh.IndexBuffer;
 import com.jme3.util.BufferUtils;
-import com.jme3.util.IntMap.Entry;
 import java.nio.Buffer;
 import java.nio.FloatBuffer;
 import java.nio.ShortBuffer;