Преглед на файлове

jme3:
- fix imports in all classes

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8843 75d07b2b-3a1a-0410-a2c5-0572b91ccdca

nor..67 преди 14 години
родител
ревизия
3cdaf0e051
променени са 100 файла, в които са добавени 275 реда и са изтрити 507 реда
  1. 5 6
      engine/src/android/com/jme3/app/AndroidHarness.java
  2. 4 5
      engine/src/android/com/jme3/app/android/AndroidApplication.java
  3. 4 5
      engine/src/android/com/jme3/asset/AndroidAssetManager.java
  4. 1 17
      engine/src/android/com/jme3/audio/android/AndroidAudioRenderer.java
  5. 2 3
      engine/src/android/com/jme3/audio/plugins/AndroidAudioLoader.java
  6. 2 2
      engine/src/android/com/jme3/input/android/AndroidInput.java
  7. 2 3
      engine/src/android/com/jme3/input/android/AndroidTouchInputListener.java
  8. 11 26
      engine/src/android/com/jme3/renderer/android/OGLESShaderRenderer.java
  9. 2 4
      engine/src/android/com/jme3/system/android/AndroidConfigChooser.java
  10. 5 6
      engine/src/android/com/jme3/system/android/JmeAndroidSystem.java
  11. 2 8
      engine/src/android/com/jme3/system/android/OGLESContext.java
  12. 0 1
      engine/src/android/com/jme3/texture/plugins/AndroidImageLoader.java
  13. 0 1
      engine/src/android/jme3test/android/DemoAndroidHarness.java
  14. 2 3
      engine/src/android/jme3test/android/DemoLaunchAdapter.java
  15. 4 9
      engine/src/android/jme3test/android/DemoMainActivity.java
  16. 3 18
      engine/src/android/jme3test/android/SimpleTexturedTest.java
  17. 0 9
      engine/src/android/jme3test/android/TestAmbient.java
  18. 0 1
      engine/src/android/jme3test/android/TestBumpModel.java
  19. 0 2
      engine/src/android/jme3test/android/TestMovingParticle.java
  20. 4 5
      engine/src/blender/com/jme3/asset/BlenderKey.java
  21. 2 3
      engine/src/blender/com/jme3/scene/plugins/blender/AbstractBlenderHelper.java
  22. 3 4
      engine/src/blender/com/jme3/scene/plugins/blender/AbstractBlenderLoader.java
  23. 4 10
      engine/src/blender/com/jme3/scene/plugins/blender/BlenderContext.java
  24. 5 6
      engine/src/blender/com/jme3/scene/plugins/blender/BlenderLoader.java
  25. 3 4
      engine/src/blender/com/jme3/scene/plugins/blender/BlenderModelLoader.java
  26. 7 13
      engine/src/blender/com/jme3/scene/plugins/blender/animations/ArmatureHelper.java
  27. 1 2
      engine/src/blender/com/jme3/scene/plugins/blender/animations/CalculationBone.java
  28. 1 2
      engine/src/blender/com/jme3/scene/plugins/blender/animations/IpoHelper.java
  29. 2 3
      engine/src/blender/com/jme3/scene/plugins/blender/cameras/CameraHelper.java
  30. 2 3
      engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintAction.java
  31. 2 3
      engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintChildOf.java
  32. 2 3
      engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintClampTo.java
  33. 0 1
      engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintDistLimit.java
  34. 2 3
      engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintFollowPath.java
  35. 5 6
      engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintHelper.java
  36. 1 2
      engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintInverseKinematics.java
  37. 0 1
      engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintLocLike.java
  38. 0 1
      engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintLocLimit.java
  39. 2 3
      engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintLockTrack.java
  40. 2 3
      engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintMinMax.java
  41. 2 3
      engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintPython.java
  42. 2 3
      engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintRigidBodyJoint.java
  43. 0 1
      engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintRotLike.java
  44. 0 1
      engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintRotLimit.java
  45. 4 6
      engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintShrinkWrap.java
  46. 0 1
      engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintSizeLike.java
  47. 0 1
      engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintSizeLimit.java
  48. 2 3
      engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintStretchTo.java
  49. 2 3
      engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintTransform.java
  50. 2 3
      engine/src/blender/com/jme3/scene/plugins/blender/curves/BezierCurve.java
  51. 10 20
      engine/src/blender/com/jme3/scene/plugins/blender/curves/CurvesHelper.java
  52. 2 3
      engine/src/blender/com/jme3/scene/plugins/blender/file/BlenderInputStream.java
  53. 2 3
      engine/src/blender/com/jme3/scene/plugins/blender/file/DnaBlockData.java
  54. 2 3
      engine/src/blender/com/jme3/scene/plugins/blender/file/Field.java
  55. 2 3
      engine/src/blender/com/jme3/scene/plugins/blender/file/Pointer.java
  56. 2 3
      engine/src/blender/com/jme3/scene/plugins/blender/file/Structure.java
  57. 2 3
      engine/src/blender/com/jme3/scene/plugins/blender/lights/LightHelper.java
  58. 7 8
      engine/src/blender/com/jme3/scene/plugins/blender/materials/MaterialContext.java
  59. 7 8
      engine/src/blender/com/jme3/scene/plugins/blender/materials/MaterialHelper.java
  60. 3 4
      engine/src/blender/com/jme3/scene/plugins/blender/meshes/MeshContext.java
  61. 3 8
      engine/src/blender/com/jme3/scene/plugins/blender/meshes/MeshHelper.java
  62. 9 16
      engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ArmatureModifier.java
  63. 6 7
      engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ArrayModifier.java
  64. 8 9
      engine/src/blender/com/jme3/scene/plugins/blender/modifiers/MirrorModifier.java
  65. 5 6
      engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ModifierHelper.java
  66. 5 8
      engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ObjectAnimationModifier.java
  67. 4 5
      engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ParticlesModifier.java
  68. 5 6
      engine/src/blender/com/jme3/scene/plugins/blender/objects/ObjectHelper.java
  69. 7 11
      engine/src/blender/com/jme3/scene/plugins/blender/objects/Properties.java
  70. 2 3
      engine/src/blender/com/jme3/scene/plugins/blender/particles/ParticlesHelper.java
  71. 2 3
      engine/src/blender/com/jme3/scene/plugins/blender/textures/ImageLoader.java
  72. 5 6
      engine/src/blender/com/jme3/scene/plugins/blender/textures/NoiseGenerator.java
  73. 4 5
      engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGenerator.java
  74. 2 3
      engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorBlend.java
  75. 2 3
      engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorClouds.java
  76. 2 3
      engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorDistnoise.java
  77. 2 3
      engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorMagic.java
  78. 2 3
      engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorMarble.java
  79. 2 3
      engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorMusgrave.java
  80. 2 3
      engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorNoise.java
  81. 2 3
      engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorStucci.java
  82. 2 3
      engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorVoronoi.java
  83. 2 3
      engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorWood.java
  84. 12 18
      engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureHelper.java
  85. 2 3
      engine/src/blender/com/jme3/scene/plugins/blender/textures/TexturePixel.java
  86. 3 4
      engine/src/blender/com/jme3/scene/plugins/blender/textures/UVCoordinatesGenerator.java
  87. 1 2
      engine/src/blender/com/jme3/scene/plugins/blender/textures/UVProjectionGenerator.java
  88. 1 5
      engine/src/bullet-common/com/jme3/bullet/BulletAppState.java
  89. 1 5
      engine/src/bullet-common/com/jme3/bullet/collision/shapes/infos/ChildCollisionShape.java
  90. 3 9
      engine/src/bullet-common/com/jme3/bullet/control/KinematicRagdollControl.java
  91. 0 1
      engine/src/bullet-common/com/jme3/bullet/control/RigidBodyControl.java
  92. 0 1
      engine/src/bullet-common/com/jme3/bullet/control/VehicleControl.java
  93. 1 6
      engine/src/bullet-common/com/jme3/bullet/control/ragdoll/RagdollUtils.java
  94. 2 11
      engine/src/bullet-common/com/jme3/bullet/util/CollisionShapeFactory.java
  95. 4 10
      engine/src/bullet/com/jme3/bullet/PhysicsSpace.java
  96. 1 5
      engine/src/bullet/com/jme3/bullet/collision/PhysicsCollisionObject.java
  97. 2 2
      engine/src/bullet/com/jme3/bullet/collision/shapes/BoxCollisionShape.java
  98. 1 5
      engine/src/bullet/com/jme3/bullet/collision/shapes/CollisionShape.java
  99. 2 2
      engine/src/bullet/com/jme3/bullet/collision/shapes/CompoundCollisionShape.java
  100. 2 2
      engine/src/bullet/com/jme3/bullet/collision/shapes/CylinderCollisionShape.java

+ 5 - 6
engine/src/android/com/jme3/app/AndroidHarness.java

@@ -1,9 +1,5 @@
 package com.jme3.app;
 
-import java.util.logging.Handler;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import com.jme3.util.JmeFormatter;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
@@ -14,15 +10,18 @@ import android.view.Display;
 import android.view.Window;
 import android.view.WindowManager;
 import android.widget.TextView;
-
 import com.jme3.input.android.AndroidInput;
 import com.jme3.input.controls.TouchListener;
 import com.jme3.input.event.TouchEvent;
 import com.jme3.system.AppSettings;
 import com.jme3.system.JmeSystem;
-import com.jme3.system.android.OGLESContext;
 import com.jme3.system.android.AndroidConfigChooser.ConfigType;
 import com.jme3.system.android.JmeAndroidSystem;
+import com.jme3.system.android.OGLESContext;
+import com.jme3.util.JmeFormatter;
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * <code>AndroidHarness</code> wraps a jme application object and runs it on Android

+ 4 - 5
engine/src/android/com/jme3/app/android/AndroidApplication.java

@@ -31,13 +31,10 @@
  */
 package com.jme3.app.android;
 
-import java.nio.CharBuffer;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.logging.Logger;
-
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
+import com.jme3.app.AndroidHarness;
 import com.jme3.app.Application;
 import com.jme3.font.BitmapFont;
 import com.jme3.font.BitmapText;
@@ -53,7 +50,9 @@ import com.jme3.scene.Spatial.CullHint;
 import com.jme3.system.AppSettings;
 import com.jme3.system.JmeSystem;
 import com.jme3.util.FastInteger;
-import com.jme3.app.AndroidHarness;
+import java.nio.CharBuffer;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.logging.Logger;
 
 
 /**

+ 4 - 5
engine/src/android/com/jme3/asset/AndroidAssetManager.java

@@ -31,16 +31,15 @@
  */
 package com.jme3.asset;
 
-import com.jme3.texture.Texture;
-import com.jme3.texture.plugins.AndroidImageLoader;
-import java.net.URL;
-import java.util.logging.Logger;
-
 import com.jme3.asset.plugins.AndroidLocator;
 import com.jme3.asset.plugins.ClasspathLocator;
 import com.jme3.audio.plugins.AndroidAudioLoader;
+import com.jme3.texture.Texture;
+import com.jme3.texture.plugins.AndroidImageLoader;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.logging.Logger;
 
 /**
  * <code>AndroidAssetManager</code> is an implementation of DesktopAssetManager for Android

+ 1 - 17
engine/src/android/com/jme3/audio/android/AndroidAudioRenderer.java

@@ -38,27 +38,11 @@ import android.content.res.AssetManager;
 import android.media.AudioManager;
 import android.media.MediaPlayer;
 import android.media.SoundPool;
-
-
-import com.jme3.audio.AudioKey;
-import com.jme3.audio.ListenerParam;
-import com.jme3.audio.AudioParam;
-
-import com.jme3.audio.AudioData;
-import com.jme3.audio.AudioRenderer;
-import com.jme3.audio.AudioNode;
 import com.jme3.audio.AudioNode.Status;
-
-import com.jme3.audio.Environment;
-import com.jme3.audio.Filter;
-import com.jme3.audio.Listener;
-
+import com.jme3.audio.*;
 import com.jme3.math.FastMath;
 import com.jme3.math.Vector3f;
-
-
 import java.io.IOException;
-
 import java.util.HashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Level;

+ 2 - 3
engine/src/android/com/jme3/audio/plugins/AndroidAudioLoader.java

@@ -1,11 +1,10 @@
 package com.jme3.audio.plugins;
 
-import java.io.IOException;
-import java.io.InputStream;
-
 import com.jme3.asset.AssetInfo;
 import com.jme3.asset.AssetLoader;
 import com.jme3.audio.android.AndroidAudioData;
+import java.io.IOException;
+import java.io.InputStream;
 
 public class AndroidAudioLoader implements AssetLoader 
 {

+ 2 - 2
engine/src/android/com/jme3/input/android/AndroidInput.java

@@ -1,7 +1,5 @@
 package com.jme3.input.android;
 
-import java.util.HashMap;
-import java.util.logging.Logger;
 import android.content.Context;
 import android.opengl.GLSurfaceView;
 import android.util.AttributeSet;
@@ -18,6 +16,8 @@ import com.jme3.input.event.TouchEvent;
 import com.jme3.input.event.TouchEvent.Type;
 import com.jme3.math.Vector2f;
 import com.jme3.util.RingBuffer;
+import java.util.HashMap;
+import java.util.logging.Logger;
 
 
 /**

+ 2 - 3
engine/src/android/com/jme3/input/android/AndroidTouchInputListener.java

@@ -1,10 +1,9 @@
 package com.jme3.input.android;
 
-import com.jme3.input.RawInputListener;
-import com.jme3.input.event.TouchEvent;
-
 import android.view.KeyEvent;
 import android.view.MotionEvent;
+import com.jme3.input.RawInputListener;
+import com.jme3.input.event.TouchEvent;
 
 /**
  * AndroidTouchInputListener is an inputlistener interface which defines callbacks/events for android touch screens

+ 11 - 26
engine/src/android/com/jme3/renderer/android/OGLESShaderRenderer.java

@@ -31,26 +31,21 @@
  */
 package com.jme3.renderer.android;
 
+import android.graphics.Bitmap;
+import android.opengl.GLES10;
+import android.opengl.GLES11;
+import android.opengl.GLES20;
+import android.os.Build;
 import com.jme3.light.LightList;
 import com.jme3.material.RenderState;
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.Matrix4f;
-import com.jme3.math.Quaternion;
-import com.jme3.math.Vector2f;
-import com.jme3.math.Vector3f;
-import com.jme3.renderer.Caps;
-import com.jme3.util.NativeObjectManager;
-import com.jme3.renderer.IDList;
-import com.jme3.renderer.Renderer;
+import com.jme3.math.*;
+import com.jme3.renderer.*;
 import com.jme3.scene.Mesh;
+import com.jme3.scene.Mesh.Mode;
 import com.jme3.scene.VertexBuffer;
 import com.jme3.scene.VertexBuffer.Format;
 import com.jme3.scene.VertexBuffer.Type;
 import com.jme3.scene.VertexBuffer.Usage;
-import com.jme3.renderer.RenderContext;
-import com.jme3.renderer.RendererException;
-import com.jme3.renderer.Statistics;
-import com.jme3.scene.Mesh.Mode;
 import com.jme3.shader.Attribute;
 import com.jme3.shader.Shader;
 import com.jme3.shader.Shader.ShaderSource;
@@ -65,25 +60,15 @@ import com.jme3.util.BufferUtils;
 import com.jme3.util.IntMap;
 import com.jme3.util.IntMap.Entry;
 import com.jme3.util.ListMap;
-import java.nio.Buffer;
-import java.nio.ByteBuffer;
-import java.nio.DoubleBuffer;
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
-import java.nio.ShortBuffer;
+import com.jme3.util.NativeObjectManager;
+import java.nio.*;
+import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.microedition.khronos.opengles.GL10;
 
-import android.graphics.Bitmap;
-import android.opengl.GLES10;
-import android.opengl.GLES11;
-import android.opengl.GLES20;
-import android.os.Build;
-import java.util.ArrayList;
-
 public class OGLESShaderRenderer implements Renderer {
 
     private static final Logger logger = Logger.getLogger(OGLESShaderRenderer.class.getName());

+ 2 - 4
engine/src/android/com/jme3/system/android/AndroidConfigChooser.java

@@ -1,14 +1,12 @@
 package com.jme3.system.android;
 
+import android.graphics.PixelFormat;
+import android.opengl.GLSurfaceView.EGLConfigChooser;
 import java.util.logging.Logger;
-
 import javax.microedition.khronos.egl.EGL10;
 import javax.microedition.khronos.egl.EGLConfig;
 import javax.microedition.khronos.egl.EGLDisplay;
 
-import android.graphics.PixelFormat;
-import android.opengl.GLSurfaceView.EGLConfigChooser;
-
 /**
  * AndroidConfigChooser is used to determine the best suited EGL Config
  * @author larynx

+ 5 - 6
engine/src/android/com/jme3/system/android/JmeAndroidSystem.java

@@ -2,22 +2,21 @@ package com.jme3.system.android;
 
 import android.app.Activity;
 import android.content.res.Resources;
-import com.jme3.system.AppSettings;
-import com.jme3.system.JmeContext;
-import com.jme3.system.Platform;
-import com.jme3.util.AndroidLogHandler;
 import com.jme3.asset.AndroidAssetManager;
 import com.jme3.asset.AssetManager;
 import com.jme3.audio.AudioRenderer;
 import com.jme3.audio.android.AndroidAudioRenderer;
+import com.jme3.system.AppSettings;
+import com.jme3.system.JmeContext;
 import com.jme3.system.JmeContext.Type;
 import com.jme3.system.JmeSystemDelegate;
+import com.jme3.system.Platform;
+import com.jme3.util.AndroidLogHandler;
 import com.jme3.util.JmeFormatter;
+import java.net.URL;
 import java.util.logging.Handler;
 import java.util.logging.Level;
 
-import java.net.URL;
-
 public class JmeAndroidSystem extends JmeSystemDelegate{
 
     private static Resources res;

+ 2 - 8
engine/src/android/com/jme3/system/android/OGLESContext.java

@@ -34,12 +34,8 @@ package com.jme3.system.android;
 
 import android.app.Activity;
 import android.content.Context;
-import android.graphics.PixelFormat;
-import android.opengl.GLES20;
 import android.opengl.GLSurfaceView;
-import android.opengl.GLSurfaceView.EGLConfigChooser;
 import android.view.SurfaceHolder;
-
 import com.jme3.app.AndroidHarness;
 import com.jme3.app.Application;
 import com.jme3.input.JoyInput;
@@ -56,10 +52,8 @@ import com.jme3.system.JmeContext;
 import com.jme3.system.SystemListener;
 import com.jme3.system.Timer;
 import com.jme3.system.android.AndroidConfigChooser.ConfigType;
-
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Logger;
-
 import javax.microedition.khronos.egl.EGL10;
 import javax.microedition.khronos.egl.EGLConfig;
 import javax.microedition.khronos.egl.EGLContext;
@@ -313,8 +307,8 @@ public class OGLESContext implements JmeContext, GLSurfaceView.Renderer
     }
     
     protected void applySettings(AppSettings settings)
-    {
-        setSettings(settings);
+    {
+        setSettings(settings);
         if (renderer != null)
             applySettingsToRenderer(renderer, this.settings);        
     }

+ 0 - 1
engine/src/android/com/jme3/texture/plugins/AndroidImageLoader.java

@@ -3,7 +3,6 @@ package com.jme3.texture.plugins;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Matrix;
-
 import com.jme3.asset.AssetInfo;
 import com.jme3.asset.AssetLoader;
 import com.jme3.asset.TextureKey;

+ 0 - 1
engine/src/android/jme3test/android/DemoAndroidHarness.java

@@ -2,7 +2,6 @@ package jme3test.android;
 
 import android.content.pm.ActivityInfo;
 import android.os.Bundle;
-
 import com.jme3.app.AndroidHarness;
 import com.jme3.system.android.AndroidConfigChooser.ConfigType;
 

+ 2 - 3
engine/src/android/jme3test/android/DemoLaunchAdapter.java

@@ -1,14 +1,13 @@
 package jme3test.android;
 
-import java.util.List;
-
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.View.OnClickListener;
+import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.TextView;
+import java.util.List;
 
 /**
  * The view adapter which gets a list of LaunchEntries and displaqs them

+ 4 - 9
engine/src/android/jme3test/android/DemoMainActivity.java

@@ -1,19 +1,14 @@
 package jme3test.android;
-import java.util.ArrayList;
-import java.util.List;
-
 import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.os.Bundle;
 import android.view.View;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemSelectedListener;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-import android.widget.Spinner;
-import android.widget.Toast;
 import android.widget.AdapterView.OnItemClickListener;
+import android.widget.AdapterView.OnItemSelectedListener;
+import android.widget.*;
+import java.util.ArrayList;
+import java.util.List;
 
 public class DemoMainActivity extends Activity {
 

+ 3 - 18
engine/src/android/jme3test/android/SimpleTexturedTest.java

@@ -8,35 +8,20 @@
 package jme3test.android;
 
 
-import java.util.List;
-import java.util.ArrayList;
-
 import com.jme3.app.SimpleApplication;
-
 import com.jme3.asset.TextureKey;
-
+import com.jme3.light.PointLight;
 import com.jme3.material.Material;
-
-import com.jme3.math.Transform;
 import com.jme3.math.ColorRGBA;
 import com.jme3.math.Vector3f;
-
+import com.jme3.scene.Geometry;
 import com.jme3.scene.Mesh;
 import com.jme3.scene.Node;
-import com.jme3.scene.Geometry;
-import com.jme3.scene.shape.Sphere;
 import com.jme3.scene.shape.Box;
-
+import com.jme3.scene.shape.Sphere;
 import com.jme3.texture.Texture;
-
-import com.jme3.light.PointLight;
-
 import com.jme3.util.TangentBinormalGenerator;
 
-import jme3tools.converters.model.ModelConverter;
-
-import java.awt.font.*;
-
 
 public class SimpleTexturedTest extends SimpleApplication {
 

+ 0 - 9
engine/src/android/jme3test/android/TestAmbient.java

@@ -32,19 +32,10 @@
 
 package jme3test.android;
 
-import android.app.Activity;
-import android.media.AudioManager;
 import android.media.SoundPool;
-
 import com.jme3.app.SimpleApplication;
-import com.jme3.asset.DesktopAssetManager;
 import com.jme3.audio.AudioNode;
-import com.jme3.audio.Listener;
-//import com.jme3.audio.PointAudioSource;
-import com.jme3.math.FastMath;
 import com.jme3.math.Vector3f;
-import com.jme3.system.AppSettings;
-import com.jme3.system.JmeSystem;
 
 public class TestAmbient extends SimpleApplication {
 

+ 0 - 1
engine/src/android/jme3test/android/TestBumpModel.java

@@ -33,7 +33,6 @@
 package jme3test.android;
 
 import com.jme3.app.SimpleApplication;
-import com.jme3.asset.AssetKey;
 import com.jme3.light.AmbientLight;
 import com.jme3.light.DirectionalLight;
 import com.jme3.light.PointLight;

+ 0 - 2
engine/src/android/jme3test/android/TestMovingParticle.java

@@ -34,10 +34,8 @@ package jme3test.android;
 import com.jme3.app.SimpleApplication;
 import com.jme3.effect.ParticleEmitter;
 import com.jme3.effect.ParticleMesh.Type;
-import com.jme3.effect.shapes.EmitterSphereShape;
 import com.jme3.input.KeyInput;
 import com.jme3.input.controls.ActionListener;
-import com.jme3.input.controls.InputListener;
 import com.jme3.input.controls.KeyTrigger;
 import com.jme3.light.AmbientLight;
 import com.jme3.material.Material;

+ 4 - 5
engine/src/blender/com/jme3/asset/BlenderKey.java

@@ -31,11 +31,6 @@
  */
 package com.jme3.asset;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Queue;
-
 import com.jme3.bounding.BoundingVolume;
 import com.jme3.collision.Collidable;
 import com.jme3.collision.CollisionResults;
@@ -54,6 +49,10 @@ 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;
 
 /**
  * Blender key. Contains path of the blender file and its loading properties.

+ 2 - 3
engine/src/blender/com/jme3/scene/plugins/blender/AbstractBlenderHelper.java

@@ -31,9 +31,6 @@
  */
 package com.jme3.scene.plugins.blender;
 
-import java.nio.FloatBuffer;
-import java.util.List;
-
 import com.jme3.math.FastMath;
 import com.jme3.math.Quaternion;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
@@ -41,6 +38,8 @@ import com.jme3.scene.plugins.blender.file.Pointer;
 import com.jme3.scene.plugins.blender.file.Structure;
 import com.jme3.scene.plugins.blender.objects.Properties;
 import com.jme3.util.BufferUtils;
+import java.nio.FloatBuffer;
+import java.util.List;
 
 /**
  * A purpose of the helper class is to split calculation code into several classes. Each helper after use should be cleared because it can

+ 3 - 4
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;
@@ -54,6 +50,9 @@ import com.jme3.scene.plugins.blender.lights.LightHelper;
 import com.jme3.scene.plugins.blender.materials.MaterialHelper;
 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.

+ 4 - 10
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.asset.AssetManager;
 import com.jme3.asset.BlenderKey;
 import com.jme3.material.Material;
@@ -54,6 +44,10 @@ import com.jme3.scene.plugins.blender.file.Structure;
 import com.jme3.scene.plugins.blender.materials.MaterialContext;
 import com.jme3.scene.plugins.blender.meshes.MeshContext;
 import com.jme3.scene.plugins.blender.modifiers.Modifier;
+import java.io.IOException;
+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * The class that stores temporary data and manages it during loading the belnd file. This class is intended to be used

+ 5 - 6
engine/src/blender/com/jme3/scene/plugins/blender/BlenderLoader.java

@@ -31,12 +31,6 @@
  */
 package com.jme3.scene.plugins.blender;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.asset.AssetInfo;
 import com.jme3.asset.BlenderKey;
 import com.jme3.asset.BlenderKey.FeaturesToLoad;
@@ -63,6 +57,11 @@ import com.jme3.scene.plugins.blender.modifiers.ModifierHelper;
 import com.jme3.scene.plugins.blender.objects.ObjectHelper;
 import com.jme3.scene.plugins.blender.particles.ParticlesHelper;
 import com.jme3.scene.plugins.blender.textures.TextureHelper;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * This is the main loading class. Have in notice that asset manager needs to have loaders for resources like textures.

+ 3 - 4
engine/src/blender/com/jme3/scene/plugins/blender/BlenderModelLoader.java

@@ -31,10 +31,6 @@
  */
 package com.jme3.scene.plugins.blender;
 
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.asset.AssetInfo;
 import com.jme3.asset.BlenderKey;
 import com.jme3.light.Light;
@@ -42,6 +38,9 @@ import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.FileBlockHeader;
+import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * This is the main loading class. Have in notice that asset manager needs to have loaders for resources like textures.

+ 7 - 13
engine/src/blender/com/jme3/scene/plugins/blender/animations/ArmatureHelper.java

@@ -31,16 +31,8 @@
  */
 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.Track;
 import com.jme3.math.Matrix4f;
 import com.jme3.math.Quaternion;
 import com.jme3.math.Vector3f;
@@ -48,11 +40,13 @@ import com.jme3.scene.plugins.blender.AbstractBlenderHelper;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.curves.BezierCurve;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
-import com.jme3.scene.plugins.blender.file.BlenderInputStream;
-import com.jme3.scene.plugins.blender.file.DynamicArray;
-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 com.jme3.scene.plugins.blender.file.*;
+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 armature functionalities.

+ 1 - 2
engine/src/blender/com/jme3/scene/plugins/blender/animations/CalculationBone.java

@@ -1,13 +1,12 @@
 package com.jme3.scene.plugins.blender.animations;
 
-import java.util.Arrays;
-
 import com.jme3.animation.Bone;
 import com.jme3.animation.BoneTrack;
 import com.jme3.math.Quaternion;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
+import java.util.Arrays;
 
 /**
  * The purpose of this class is to imitate bone's movement when calculating inverse kinematics.

+ 1 - 2
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;
@@ -9,6 +7,7 @@ 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.List;
 
 /**
  * This class helps to compute values from interpolation curves for features like animation or constraint influence. The

+ 2 - 3
engine/src/blender/com/jme3/scene/plugins/blender/cameras/CameraHelper.java

@@ -1,14 +1,13 @@
 package com.jme3.scene.plugins.blender.cameras;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.asset.BlenderKey.FeaturesToLoad;
 import com.jme3.renderer.Camera;
 import com.jme3.scene.plugins.blender.AbstractBlenderHelper;
 import com.jme3.scene.plugins.blender.BlenderContext;
 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;
 
 /**
  * A class that is used to load cameras into the scene.

+ 2 - 3
engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintAction.java

@@ -1,13 +1,12 @@
 package com.jme3.scene.plugins.blender.constraints;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.animation.Animation;
 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;
 
 /**
  * This class represents 'Action' constraint type in blender.

+ 2 - 3
engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintChildOf.java

@@ -1,13 +1,12 @@
 package com.jme3.scene.plugins.blender.constraints;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.animation.Animation;
 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;
 
 /**
  * This class represents 'ChildOf' constraint type in blender.

+ 2 - 3
engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintClampTo.java

@@ -1,13 +1,12 @@
 package com.jme3.scene.plugins.blender.constraints;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.animation.Animation;
 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;
 
 /**
  * This class represents 'Clamp to' constraint type in blender.

+ 0 - 1
engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintDistLimit.java

@@ -2,7 +2,6 @@ package com.jme3.scene.plugins.blender.constraints;
 
 import com.jme3.animation.Animation;
 import com.jme3.animation.BoneTrack;
-import com.jme3.animation.Track;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.animations.Ipo;

+ 2 - 3
engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintFollowPath.java

@@ -1,13 +1,12 @@
 package com.jme3.scene.plugins.blender.constraints;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.animation.Animation;
 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;
 
 /**
  * This class represents 'Follow path' constraint type in blender.

+ 5 - 6
engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintHelper.java

@@ -1,11 +1,5 @@
 package com.jme3.scene.plugins.blender.constraints;
 
-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;
@@ -13,6 +7,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.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Logger;
 
 /**
  * This class should be used for constraint calculations.

+ 1 - 2
engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintInverseKinematics.java

@@ -1,12 +1,11 @@
 package com.jme3.scene.plugins.blender.constraints;
 
-import java.util.logging.Logger;
-
 import com.jme3.animation.Animation;
 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.Logger;
 
 /**
  * This class represents 'Inverse kinematics' constraint type in blender.

+ 0 - 1
engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintLocLike.java

@@ -2,7 +2,6 @@ package com.jme3.scene.plugins.blender.constraints;
 
 import com.jme3.animation.Animation;
 import com.jme3.animation.BoneTrack;
-import com.jme3.animation.Track;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.animations.Ipo;

+ 0 - 1
engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintLocLimit.java

@@ -2,7 +2,6 @@ package com.jme3.scene.plugins.blender.constraints;
 
 import com.jme3.animation.Animation;
 import com.jme3.animation.BoneTrack;
-import com.jme3.animation.Track;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.animations.Ipo;

+ 2 - 3
engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintLockTrack.java

@@ -1,13 +1,12 @@
 package com.jme3.scene.plugins.blender.constraints;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.animation.Animation;
 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;
 
 /**
  * This class represents 'Action' constraint type in blender.

+ 2 - 3
engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintMinMax.java

@@ -1,13 +1,12 @@
 package com.jme3.scene.plugins.blender.constraints;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.animation.Animation;
 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;
 
 /**
  * This class represents 'Min max' constraint type in blender.

+ 2 - 3
engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintPython.java

@@ -1,13 +1,12 @@
 package com.jme3.scene.plugins.blender.constraints;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.animation.Animation;
 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;
 
 /**
  * This class represents 'Python' constraint type in blender.

+ 2 - 3
engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintRigidBodyJoint.java

@@ -1,13 +1,12 @@
 package com.jme3.scene.plugins.blender.constraints;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.animation.Animation;
 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;
 
 /**
  * This class represents 'Rigid body joint' constraint type in blender.

+ 0 - 1
engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintRotLike.java

@@ -2,7 +2,6 @@ package com.jme3.scene.plugins.blender.constraints;
 
 import com.jme3.animation.Animation;
 import com.jme3.animation.BoneTrack;
-import com.jme3.animation.Track;
 import com.jme3.math.Quaternion;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.animations.Ipo;

+ 0 - 1
engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintRotLimit.java

@@ -2,7 +2,6 @@ package com.jme3.scene.plugins.blender.constraints;
 
 import com.jme3.animation.Animation;
 import com.jme3.animation.BoneTrack;
-import com.jme3.animation.Track;
 import com.jme3.math.FastMath;
 import com.jme3.math.Quaternion;
 import com.jme3.scene.plugins.blender.BlenderContext;

+ 4 - 6
engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintShrinkWrap.java

@@ -1,13 +1,7 @@
 package com.jme3.scene.plugins.blender.constraints;
 
-import java.nio.FloatBuffer;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Logger;
-
 import com.jme3.animation.Animation;
 import com.jme3.animation.BoneTrack;
-import com.jme3.animation.Track;
 import com.jme3.math.Quaternion;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Geometry;
@@ -20,6 +14,10 @@ import com.jme3.scene.plugins.blender.BlenderContext.LoadedFeatureDataType;
 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.nio.FloatBuffer;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Logger;
 
 /**
  * This class represents 'Shrink wrap' constraint type in blender.

+ 0 - 1
engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintSizeLike.java

@@ -2,7 +2,6 @@ package com.jme3.scene.plugins.blender.constraints;
 
 import com.jme3.animation.Animation;
 import com.jme3.animation.BoneTrack;
-import com.jme3.animation.Track;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.animations.Ipo;

+ 0 - 1
engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintSizeLimit.java

@@ -2,7 +2,6 @@ package com.jme3.scene.plugins.blender.constraints;
 
 import com.jme3.animation.Animation;
 import com.jme3.animation.BoneTrack;
-import com.jme3.animation.Track;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.animations.Ipo;

+ 2 - 3
engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintStretchTo.java

@@ -1,13 +1,12 @@
 package com.jme3.scene.plugins.blender.constraints;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.animation.Animation;
 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;
 
 /**
  * This class represents 'Stretch to' constraint type in blender.

+ 2 - 3
engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintTransform.java

@@ -1,13 +1,12 @@
 package com.jme3.scene.plugins.blender.constraints;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.animation.Animation;
 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;
 
 /**
  * This class represents 'Transform' constraint type in blender.

+ 2 - 3
engine/src/blender/com/jme3/scene/plugins/blender/curves/BezierCurve.java

@@ -1,11 +1,10 @@
 package com.jme3.scene.plugins.blender.curves;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.jme3.math.Vector3f;
 import com.jme3.scene.plugins.blender.file.DynamicArray;
 import com.jme3.scene.plugins.blender.file.Structure;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * A class that helps to calculate the bezier curves calues. It uses doubles for performing calculations to minimize

+ 10 - 20
engine/src/blender/com/jme3/scene/plugins/blender/curves/CurvesHelper.java

@@ -1,40 +1,30 @@
 package com.jme3.scene.plugins.blender.curves;
 
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
-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.FaceCullMode;
-import com.jme3.math.FastMath;
-import com.jme3.math.Matrix4f;
-import com.jme3.math.Quaternion;
-import com.jme3.math.Spline;
 import com.jme3.math.Spline.SplineType;
-import com.jme3.math.Vector3f;
-import com.jme3.math.Vector4f;
+import com.jme3.math.*;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Mesh;
 import com.jme3.scene.VertexBuffer.Type;
 import com.jme3.scene.plugins.blender.AbstractBlenderHelper;
 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.DynamicArray;
-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 com.jme3.scene.plugins.blender.file.*;
 import com.jme3.scene.plugins.blender.materials.MaterialHelper;
 import com.jme3.scene.plugins.blender.meshes.MeshHelper;
 import com.jme3.scene.plugins.blender.objects.Properties;
 import com.jme3.scene.shape.Curve;
 import com.jme3.scene.shape.Surface;
 import com.jme3.util.BufferUtils;
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+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;
 
 /**
  * A class that is used in mesh calculations.

+ 2 - 3
engine/src/blender/com/jme3/scene/plugins/blender/file/BlenderInputStream.java

@@ -31,6 +31,8 @@
  */
 package com.jme3.scene.plugins.blender.file;
 
+import com.jme3.asset.AssetManager;
+import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -38,9 +40,6 @@ import java.io.InputStream;
 import java.util.logging.Logger;
 import java.util.zip.GZIPInputStream;
 
-import com.jme3.asset.AssetManager;
-import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
-
 /**
  * An input stream with random access to data.
  * @author Marcin Roguski

+ 2 - 3
engine/src/blender/com/jme3/scene/plugins/blender/file/DnaBlockData.java

@@ -31,11 +31,10 @@
  */
 package com.jme3.scene.plugins.blender.file;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * The data block containing the description of the file.

+ 2 - 3
engine/src/blender/com/jme3/scene/plugins/blender/file/Field.java

@@ -1,11 +1,10 @@
 package com.jme3.scene.plugins.blender.file;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.Structure.DataType;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * This class represents a single field in the structure. It can be either a primitive type or a table or a reference to

+ 2 - 3
engine/src/blender/com/jme3/scene/plugins/blender/file/Pointer.java

@@ -31,11 +31,10 @@
  */
 package com.jme3.scene.plugins.blender.file;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * A class that represents a pointer of any level that can be stored in the file.

+ 2 - 3
engine/src/blender/com/jme3/scene/plugins/blender/file/Structure.java

@@ -31,14 +31,13 @@
  */
 package com.jme3.scene.plugins.blender.file;
 
+import com.jme3.scene.plugins.blender.BlenderContext;
+import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import com.jme3.scene.plugins.blender.BlenderContext;
-import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
-
 /**
  * A class representing a single structure in the file.
  * @author Marcin Roguski

+ 2 - 3
engine/src/blender/com/jme3/scene/plugins/blender/lights/LightHelper.java

@@ -31,9 +31,6 @@
  */
 package com.jme3.scene.plugins.blender.lights;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.asset.BlenderKey.FeaturesToLoad;
 import com.jme3.light.DirectionalLight;
 import com.jme3.light.Light;
@@ -46,6 +43,8 @@ import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.BlenderContext.LoadedFeatureDataType;
 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;
 
 /**
  * A class that is used in light calculations.

+ 7 - 8
engine/src/blender/com/jme3/scene/plugins/blender/materials/MaterialContext.java

@@ -1,13 +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.Level;
-import java.util.logging.Logger;
-
 import com.jme3.math.ColorRGBA;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
@@ -20,6 +12,13 @@ import com.jme3.scene.plugins.blender.textures.TextureHelper;
 import com.jme3.texture.Texture;
 import com.jme3.texture.Texture.Type;
 import com.jme3.texture.Texture.WrapMode;
+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.Level;
+import java.util.logging.Logger;
 
 /**
  * This class holds the data about the material.

+ 7 - 8
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;
@@ -60,6 +52,13 @@ import com.jme3.texture.Image.Format;
 import com.jme3.texture.Texture;
 import com.jme3.texture.Texture.Type;
 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());

+ 3 - 4
engine/src/blender/com/jme3/scene/plugins/blender/meshes/MeshContext.java

@@ -1,12 +1,11 @@
 package com.jme3.scene.plugins.blender.meshes;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.VertexBuffer;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Class that holds information about the mesh.

+ 3 - 8
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.FloatBuffer;
-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.material.Material;
 import com.jme3.math.FastMath;
@@ -65,6 +57,9 @@ import com.jme3.scene.plugins.blender.textures.TextureHelper;
 import com.jme3.scene.plugins.blender.textures.UVCoordinatesGenerator;
 import com.jme3.texture.Texture;
 import com.jme3.util.BufferUtils;
+import java.nio.FloatBuffer;
+import java.util.*;
+import java.util.Map.Entry;
 
 /**
  * A class that is used in mesh calculations.

+ 9 - 16
engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ArmatureModifier.java

@@ -1,21 +1,6 @@
 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;
-import com.jme3.animation.BoneTrack;
-import com.jme3.animation.Skeleton;
-import com.jme3.animation.SkeletonControl;
-import com.jme3.animation.Track;
+import com.jme3.animation.*;
 import com.jme3.math.Matrix4f;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Mesh;
@@ -37,6 +22,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.

+ 6 - 7
engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ArrayModifier.java

@@ -1,12 +1,5 @@
 package com.jme3.scene.plugins.blender.modifiers;
 
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.bounding.BoundingBox;
 import com.jme3.bounding.BoundingSphere;
 import com.jme3.bounding.BoundingVolume;
@@ -24,6 +17,12 @@ import com.jme3.scene.plugins.blender.file.Pointer;
 import com.jme3.scene.plugins.blender.file.Structure;
 import com.jme3.scene.plugins.blender.objects.ObjectHelper;
 import com.jme3.scene.shape.Curve;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * This modifier allows to array modifier to the object.

+ 8 - 9
engine/src/blender/com/jme3/scene/plugins/blender/modifiers/MirrorModifier.java

@@ -1,14 +1,5 @@
 package com.jme3.scene.plugins.blender.modifiers;
 
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
-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.math.Vector3f;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Mesh;
@@ -20,6 +11,14 @@ 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 com.jme3.scene.plugins.blender.objects.ObjectHelper;
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+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 array modifier to the object.

+ 5 - 6
engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ModifierHelper.java

@@ -31,17 +31,16 @@
  */
 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.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.

+ 5 - 8
engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ObjectAnimationModifier.java

@@ -1,16 +1,8 @@
 package com.jme3.scene.plugins.blender.modifiers;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.animation.AnimControl;
 import com.jme3.animation.Animation;
-import com.jme3.animation.BoneTrack;
 import com.jme3.animation.SpatialTrack;
-import com.jme3.animation.Track;
 import com.jme3.scene.Node;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.animations.Ipo;
@@ -21,6 +13,11 @@ 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 com.jme3.scene.plugins.ogre.AnimData;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * This modifier allows to add animation to the object.

+ 4 - 5
engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ParticlesModifier.java

@@ -1,10 +1,5 @@
 package com.jme3.scene.plugins.blender.modifiers;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.effect.ParticleEmitter;
 import com.jme3.effect.shapes.EmitterMeshVertexShape;
 import com.jme3.effect.shapes.EmitterShape;
@@ -19,6 +14,10 @@ import com.jme3.scene.plugins.blender.file.Pointer;
 import com.jme3.scene.plugins.blender.file.Structure;
 import com.jme3.scene.plugins.blender.materials.MaterialHelper;
 import com.jme3.scene.plugins.blender.particles.ParticlesHelper;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * This modifier allows to add particles to the object.

+ 5 - 6
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.ArrayList;
-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.light.DirectionalLight;
 import com.jme3.light.Light;
@@ -65,6 +59,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.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 object calculations.

+ 7 - 11
engine/src/blender/com/jme3/scene/plugins/blender/objects/Properties.java

@@ -1,22 +1,18 @@
 package com.jme3.scene.plugins.blender.objects;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Logger;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 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.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Logger;
 
 /**
  * The blender object's custom properties.

+ 2 - 3
engine/src/blender/com/jme3/scene/plugins/blender/particles/ParticlesHelper.java

@@ -1,12 +1,10 @@
 package com.jme3.scene.plugins.blender.particles;
 
-import java.util.logging.Logger;
-
 import com.jme3.effect.ParticleEmitter;
 import com.jme3.effect.ParticleMesh.Type;
 import com.jme3.effect.influencers.EmptyParticleInfluencer;
-import com.jme3.effect.influencers.ParticleInfluencer;
 import com.jme3.effect.influencers.NewtonianParticleInfluencer;
+import com.jme3.effect.influencers.ParticleInfluencer;
 import com.jme3.effect.shapes.EmitterMeshConvexHullShape;
 import com.jme3.effect.shapes.EmitterMeshFaceShape;
 import com.jme3.effect.shapes.EmitterMeshVertexShape;
@@ -17,6 +15,7 @@ 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.logging.Logger;
 
 public class ParticlesHelper extends AbstractBlenderHelper {
 	private static final Logger			LOGGER		= Logger.getLogger(ParticlesHelper.class.getName());

+ 2 - 3
engine/src/blender/com/jme3/scene/plugins/blender/textures/ImageLoader.java

@@ -31,14 +31,13 @@
  */
 package com.jme3.scene.plugins.blender.textures;
 
-import java.io.InputStream;
-import java.util.logging.Logger;
-
 import com.jme3.scene.plugins.blender.file.BlenderInputStream;
 import com.jme3.texture.Image;
 import com.jme3.texture.plugins.AWTLoader;
 import com.jme3.texture.plugins.DDSLoader;
 import com.jme3.texture.plugins.TGALoader;
+import java.io.InputStream;
+import java.util.logging.Logger;
 
 /**
  * An image loader class. It uses three loaders (AWTLoader, TGALoader and DDSLoader) in an attempt to load the image from the given

+ 5 - 6
engine/src/blender/com/jme3/scene/plugins/blender/textures/NoiseGenerator.java

@@ -31,6 +31,11 @@
  */
 package com.jme3.scene.plugins.blender.textures;
 
+import com.jme3.math.FastMath;
+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.TextureGeneratorMusgrave.MusgraveData;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.ObjectInputStream;
@@ -39,12 +44,6 @@ import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.jme3.math.FastMath;
-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.TextureGeneratorMusgrave.MusgraveData;
-
 /**
  * This generator is responsible for creating various noises used to create
  * generated textures loaded from blender.

+ 4 - 5
engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGenerator.java

@@ -31,11 +31,6 @@
  */
 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;
@@ -43,6 +38,10 @@ 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 com.jme3.texture.Texture;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * This class is a base class for texture generators.

+ 2 - 3
engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorBlend.java

@@ -31,9 +31,6 @@
  */
 package com.jme3.scene.plugins.blender.textures;
 
-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.file.Structure;
@@ -42,6 +39,8 @@ import com.jme3.texture.Image.Format;
 import com.jme3.texture.Texture;
 import com.jme3.texture.Texture3D;
 import com.jme3.util.BufferUtils;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
 
 /**
  * This class generates the 'blend' texture.

+ 2 - 3
engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorClouds.java

@@ -31,9 +31,6 @@
  */
 package com.jme3.scene.plugins.blender.textures;
 
-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.file.Structure;
@@ -42,6 +39,8 @@ import com.jme3.texture.Image.Format;
 import com.jme3.texture.Texture;
 import com.jme3.texture.Texture3D;
 import com.jme3.util.BufferUtils;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
 
 /**
  * This class generates the 'clouds' texture.

+ 2 - 3
engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorDistnoise.java

@@ -31,9 +31,6 @@
  */
 package com.jme3.scene.plugins.blender.textures;
 
-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.file.Structure;
@@ -43,6 +40,8 @@ import com.jme3.texture.Image.Format;
 import com.jme3.texture.Texture;
 import com.jme3.texture.Texture3D;
 import com.jme3.util.BufferUtils;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
 
 /**
  * This class generates the 'distorted noise' texture.

+ 2 - 3
engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorMagic.java

@@ -31,9 +31,6 @@
  */
 package com.jme3.scene.plugins.blender.textures;
 
-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.file.Structure;
@@ -42,6 +39,8 @@ import com.jme3.texture.Image.Format;
 import com.jme3.texture.Texture;
 import com.jme3.texture.Texture3D;
 import com.jme3.util.BufferUtils;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
 
 /**
  * This class generates the 'magic' texture.

+ 2 - 3
engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorMarble.java

@@ -31,9 +31,6 @@
  */
 package com.jme3.scene.plugins.blender.textures;
 
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.file.Structure;
 import com.jme3.texture.Image;
@@ -41,6 +38,8 @@ import com.jme3.texture.Image.Format;
 import com.jme3.texture.Texture;
 import com.jme3.texture.Texture3D;
 import com.jme3.util.BufferUtils;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
 
 /**
  * This class generates the 'marble' texture.

+ 2 - 3
engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorMusgrave.java

@@ -31,9 +31,6 @@
  */
 package com.jme3.scene.plugins.blender.textures;
 
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.file.Structure;
 import com.jme3.scene.plugins.blender.textures.NoiseGenerator.MusgraveFunction;
@@ -42,6 +39,8 @@ import com.jme3.texture.Image.Format;
 import com.jme3.texture.Texture;
 import com.jme3.texture.Texture3D;
 import com.jme3.util.BufferUtils;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
 
 /**
  * This class generates the 'musgrave' texture.

+ 2 - 3
engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorNoise.java

@@ -31,9 +31,6 @@
  */
 package com.jme3.scene.plugins.blender.textures;
 
-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.file.Structure;
@@ -42,6 +39,8 @@ import com.jme3.texture.Image.Format;
 import com.jme3.texture.Texture;
 import com.jme3.texture.Texture3D;
 import com.jme3.util.BufferUtils;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
 
 /**
  * This class generates the 'noise' texture.

+ 2 - 3
engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorStucci.java

@@ -31,9 +31,6 @@
  */
 package com.jme3.scene.plugins.blender.textures;
 
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.file.Structure;
 import com.jme3.texture.Image;
@@ -41,6 +38,8 @@ import com.jme3.texture.Image.Format;
 import com.jme3.texture.Texture;
 import com.jme3.texture.Texture3D;
 import com.jme3.util.BufferUtils;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
 
 /**
  * This class generates the 'stucci' texture.

+ 2 - 3
engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorVoronoi.java

@@ -31,9 +31,6 @@
  */
 package com.jme3.scene.plugins.blender.textures;
 
-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.file.Structure;
@@ -43,6 +40,8 @@ import com.jme3.texture.Image.Format;
 import com.jme3.texture.Texture;
 import com.jme3.texture.Texture3D;
 import com.jme3.util.BufferUtils;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
 
 /**
  * This class generates the 'voronoi' texture.

+ 2 - 3
engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorWood.java

@@ -30,9 +30,6 @@
  */
 package com.jme3.scene.plugins.blender.textures;
 
-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.file.Structure;
@@ -41,6 +38,8 @@ import com.jme3.texture.Image.Format;
 import com.jme3.texture.Texture;
 import com.jme3.texture.Texture3D;
 import com.jme3.util.BufferUtils;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
 
 /**
  * This class generates the 'wood' texture.

+ 12 - 18
engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureHelper.java

@@ -31,25 +31,8 @@
  */
 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.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import jme3tools.converters.ImageToAwt;
-
-import com.jme3.asset.AssetManager;
-import com.jme3.asset.AssetNotFoundException;
-import com.jme3.asset.BlenderKey;
 import com.jme3.asset.BlenderKey.FeaturesToLoad;
-import com.jme3.asset.GeneratedTextureKey;
-import com.jme3.asset.TextureKey;
+import com.jme3.asset.*;
 import com.jme3.math.ColorRGBA;
 import com.jme3.math.FastMath;
 import com.jme3.math.Vector3f;
@@ -70,6 +53,17 @@ import com.jme3.texture.Texture.WrapMode;
 import com.jme3.texture.Texture2D;
 import com.jme3.texture.Texture3D;
 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.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import jme3tools.converters.ImageToAwt;
 
 /**
  * A class that is used in texture calculations.

+ 2 - 3
engine/src/blender/com/jme3/scene/plugins/blender/textures/TexturePixel.java

@@ -1,12 +1,11 @@
 package com.jme3.scene.plugins.blender.textures;
 
+import com.jme3.math.ColorRGBA;
+import com.jme3.texture.Image.Format;
 import java.nio.ByteBuffer;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.jme3.math.ColorRGBA;
-import com.jme3.texture.Image.Format;
-
 /*package*/ class TexturePixel implements Cloneable {
 	private static final Logger LOGGER = Logger.getLogger(TexturePixel.class.getName());
 	

+ 3 - 4
engine/src/blender/com/jme3/scene/plugins/blender/textures/UVCoordinatesGenerator.java

@@ -31,10 +31,6 @@
  */
 package com.jme3.scene.plugins.blender.textures;
 
-import java.nio.FloatBuffer;
-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 +42,9 @@ import com.jme3.scene.VertexBuffer;
 import com.jme3.scene.VertexBuffer.Format;
 import com.jme3.scene.VertexBuffer.Usage;
 import com.jme3.util.BufferUtils;
+import java.nio.FloatBuffer;
+import java.util.List;
+import java.util.logging.Logger;
 
 /**
  * This class is used for UV coordinates generation.

+ 1 - 2
engine/src/blender/com/jme3/scene/plugins/blender/textures/UVProjectionGenerator.java

@@ -1,7 +1,5 @@
 package com.jme3.scene.plugins.blender.textures;
 
-import java.nio.FloatBuffer;
-
 import com.jme3.bounding.BoundingBox;
 import com.jme3.bounding.BoundingSphere;
 import com.jme3.math.FastMath;
@@ -10,6 +8,7 @@ import com.jme3.math.Vector3f;
 import com.jme3.scene.Mesh;
 import com.jme3.scene.VertexBuffer;
 import com.jme3.scene.plugins.blender.textures.UVCoordinatesGenerator.BoundingTube;
+import java.nio.FloatBuffer;
 
 /**
  * This class helps with projection calculations.

+ 1 - 5
engine/src/bullet-common/com/jme3/bullet/BulletAppState.java

@@ -10,11 +10,7 @@ import com.jme3.app.state.AppStateManager;
 import com.jme3.bullet.PhysicsSpace.BroadphaseType;
 import com.jme3.math.Vector3f;
 import com.jme3.renderer.RenderManager;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 

+ 1 - 5
engine/src/bullet-common/com/jme3/bullet/collision/shapes/infos/ChildCollisionShape.java

@@ -6,11 +6,7 @@ package com.jme3.bullet.collision.shapes.infos;
 
 import com.jme3.bullet.collision.shapes.BoxCollisionShape;
 import com.jme3.bullet.collision.shapes.CollisionShape;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import com.jme3.math.Matrix3f;
 import com.jme3.math.Vector3f;
 import java.io.IOException;

+ 3 - 9
engine/src/bullet-common/com/jme3/bullet/control/KinematicRagdollControl.java

@@ -31,8 +31,6 @@
  */
 package com.jme3.bullet.control;
 
-import com.jme3.bullet.control.ragdoll.RagdollPreset;
-import com.jme3.bullet.control.ragdoll.HumanoidRagdollPreset;
 import com.jme3.animation.AnimControl;
 import com.jme3.animation.Bone;
 import com.jme3.animation.Skeleton;
@@ -45,6 +43,8 @@ import com.jme3.bullet.collision.PhysicsCollisionObject;
 import com.jme3.bullet.collision.RagdollCollisionListener;
 import com.jme3.bullet.collision.shapes.BoxCollisionShape;
 import com.jme3.bullet.collision.shapes.HullCollisionShape;
+import com.jme3.bullet.control.ragdoll.HumanoidRagdollPreset;
+import com.jme3.bullet.control.ragdoll.RagdollPreset;
 import com.jme3.bullet.control.ragdoll.RagdollUtils;
 import com.jme3.bullet.joints.SixDofJoint;
 import com.jme3.bullet.objects.PhysicsRigidBody;
@@ -59,13 +59,7 @@ import com.jme3.scene.Spatial;
 import com.jme3.scene.control.Control;
 import com.jme3.util.TempVars;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
+import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 

+ 0 - 1
engine/src/bullet-common/com/jme3/bullet/control/RigidBodyControl.java

@@ -20,7 +20,6 @@ import com.jme3.renderer.RenderManager;
 import com.jme3.renderer.ViewPort;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Mesh;
-import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
 import com.jme3.scene.control.Control;
 import com.jme3.scene.shape.Box;

+ 0 - 1
engine/src/bullet-common/com/jme3/bullet/control/VehicleControl.java

@@ -6,7 +6,6 @@ package com.jme3.bullet.control;
 
 import com.jme3.bullet.PhysicsSpace;
 import com.jme3.bullet.collision.shapes.CollisionShape;
-import com.jme3.bullet.joints.PhysicsJoint;
 import com.jme3.bullet.objects.PhysicsVehicle;
 import com.jme3.bullet.objects.VehicleWheel;
 import com.jme3.export.InputCapsule;

+ 1 - 6
engine/src/bullet-common/com/jme3/bullet/control/ragdoll/RagdollUtils.java

@@ -18,12 +18,7 @@ import com.jme3.scene.Spatial;
 import com.jme3.scene.VertexBuffer.Type;
 import java.nio.ByteBuffer;
 import java.nio.FloatBuffer;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 /**
  *

+ 2 - 11
engine/src/bullet-common/com/jme3/bullet/util/CollisionShapeFactory.java

@@ -32,21 +32,12 @@
 package com.jme3.bullet.util;
 
 import com.jme3.bounding.BoundingBox;
-import com.jme3.bullet.collision.shapes.BoxCollisionShape;
-import com.jme3.bullet.collision.shapes.CollisionShape;
-import com.jme3.bullet.collision.shapes.CompoundCollisionShape;
-import com.jme3.bullet.collision.shapes.HeightfieldCollisionShape;
-import com.jme3.bullet.collision.shapes.HullCollisionShape;
-import com.jme3.bullet.collision.shapes.MeshCollisionShape;
+import com.jme3.bullet.collision.shapes.*;
 import com.jme3.bullet.collision.shapes.infos.ChildCollisionShape;
 import com.jme3.math.Matrix3f;
 import com.jme3.math.Transform;
 import com.jme3.math.Vector3f;
-import com.jme3.scene.Geometry;
-import com.jme3.scene.Mesh;
-import com.jme3.scene.Node;
-import com.jme3.scene.Spatial;
-import com.jme3.scene.UserData;
+import com.jme3.scene.*;
 import com.jme3.terrain.geomipmap.TerrainPatch;
 import com.jme3.terrain.geomipmap.TerrainQuad;
 import java.util.Iterator;

+ 4 - 10
engine/src/bullet/com/jme3/bullet/PhysicsSpace.java

@@ -33,23 +33,17 @@ package com.jme3.bullet;
 
 import com.jme3.app.AppTask;
 import com.jme3.asset.AssetManager;
-import com.jme3.math.Vector3f;
-import com.jme3.bullet.collision.PhysicsCollisionEvent;
-import com.jme3.bullet.collision.PhysicsCollisionEventFactory;
-import com.jme3.bullet.collision.PhysicsCollisionGroupListener;
-import com.jme3.bullet.collision.PhysicsCollisionListener;
-import com.jme3.bullet.collision.PhysicsCollisionObject;
-import com.jme3.bullet.collision.PhysicsRayTestResult;
-import com.jme3.bullet.collision.PhysicsSweepTestResult;
+import com.jme3.bullet.collision.*;
 import com.jme3.bullet.collision.shapes.CollisionShape;
 import com.jme3.bullet.control.PhysicsControl;
 import com.jme3.bullet.control.RigidBodyControl;
 import com.jme3.bullet.joints.PhysicsJoint;
-import com.jme3.bullet.objects.PhysicsGhostObject;
 import com.jme3.bullet.objects.PhysicsCharacter;
-import com.jme3.bullet.objects.PhysicsVehicle;
+import com.jme3.bullet.objects.PhysicsGhostObject;
 import com.jme3.bullet.objects.PhysicsRigidBody;
+import com.jme3.bullet.objects.PhysicsVehicle;
 import com.jme3.math.Transform;
+import com.jme3.math.Vector3f;
 import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
 import java.util.Iterator;

+ 1 - 5
engine/src/bullet/com/jme3/bullet/collision/PhysicsCollisionObject.java

@@ -34,11 +34,7 @@ package com.jme3.bullet.collision;
 import com.jme3.asset.AssetManager;
 import com.jme3.bullet.collision.shapes.CollisionShape;
 import com.jme3.bullet.util.DebugShapeFactory;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import com.jme3.material.Material;
 import com.jme3.math.ColorRGBA;
 import com.jme3.math.Vector3f;

+ 2 - 2
engine/src/bullet/com/jme3/bullet/collision/shapes/BoxCollisionShape.java

@@ -31,11 +31,11 @@
  */
 package com.jme3.bullet.collision.shapes;
 
+import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
-import com.jme3.math.Vector3f;
-import com.jme3.export.InputCapsule;
 import com.jme3.export.OutputCapsule;
+import com.jme3.math.Vector3f;
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;

+ 1 - 5
engine/src/bullet/com/jme3/bullet/collision/shapes/CollisionShape.java

@@ -31,12 +31,8 @@
  */
 package com.jme3.bullet.collision.shapes;
 
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
+import com.jme3.export.*;
 import com.jme3.math.Vector3f;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;

+ 2 - 2
engine/src/bullet/com/jme3/bullet/collision/shapes/CompoundCollisionShape.java

@@ -32,12 +32,12 @@
 package com.jme3.bullet.collision.shapes;
 
 import com.jme3.bullet.collision.shapes.infos.ChildCollisionShape;
+import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
+import com.jme3.export.OutputCapsule;
 import com.jme3.math.Matrix3f;
 import com.jme3.math.Vector3f;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.OutputCapsule;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;

+ 2 - 2
engine/src/bullet/com/jme3/bullet/collision/shapes/CylinderCollisionShape.java

@@ -31,11 +31,11 @@
  */
 package com.jme3.bullet.collision.shapes;
 
+import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
-import com.jme3.math.Vector3f;
-import com.jme3.export.InputCapsule;
 import com.jme3.export.OutputCapsule;
+import com.jme3.math.Vector3f;
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;

Някои файлове не бяха показани, защото твърде много файлове са промени