Bläddra i källkod

Refactoring:
1. moved BlenderFileException to com.jme3.scene.plugins.blender.file and getting rid of one package.
2. loader classes now throw IOException when loading problems occur as they should do (BlenderFileException is only used internally).

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

Kae..pl 12 år sedan
förälder
incheckning
638947623d
38 ändrade filer med 51 tillägg och 48 borttagningar
  1. 1 1
      engine/src/blender/com/jme3/scene/plugins/blender/AbstractBlenderHelper.java
  2. 1 1
      engine/src/blender/com/jme3/scene/plugins/blender/AbstractBlenderLoader.java
  3. 2 3
      engine/src/blender/com/jme3/scene/plugins/blender/BlenderLoader.java
  4. 2 3
      engine/src/blender/com/jme3/scene/plugins/blender/BlenderModelLoader.java
  5. 1 1
      engine/src/blender/com/jme3/scene/plugins/blender/animations/ArmatureHelper.java
  6. 1 1
      engine/src/blender/com/jme3/scene/plugins/blender/animations/BoneContext.java
  7. 2 1
      engine/src/blender/com/jme3/scene/plugins/blender/animations/IpoHelper.java
  8. 2 1
      engine/src/blender/com/jme3/scene/plugins/blender/cameras/CameraHelper.java
  9. 1 1
      engine/src/blender/com/jme3/scene/plugins/blender/constraints/BoneConstraint.java
  10. 1 1
      engine/src/blender/com/jme3/scene/plugins/blender/constraints/Constraint.java
  11. 1 1
      engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintHelper.java
  12. 1 1
      engine/src/blender/com/jme3/scene/plugins/blender/constraints/SkeletonConstraint.java
  13. 1 1
      engine/src/blender/com/jme3/scene/plugins/blender/constraints/SpatialConstraint.java
  14. 1 1
      engine/src/blender/com/jme3/scene/plugins/blender/constraints/definitions/ConstraintDefinitionFactory.java
  15. 1 1
      engine/src/blender/com/jme3/scene/plugins/blender/curves/CurvesHelper.java
  16. 1 1
      engine/src/blender/com/jme3/scene/plugins/blender/file/BlenderFileException.java
  17. 0 2
      engine/src/blender/com/jme3/scene/plugins/blender/file/BlenderInputStream.java
  18. 1 1
      engine/src/blender/com/jme3/scene/plugins/blender/file/DnaBlockData.java
  19. 3 5
      engine/src/blender/com/jme3/scene/plugins/blender/file/DynamicArray.java
  20. 1 1
      engine/src/blender/com/jme3/scene/plugins/blender/file/Field.java
  21. 0 1
      engine/src/blender/com/jme3/scene/plugins/blender/file/FileBlockHeader.java
  22. 2 2
      engine/src/blender/com/jme3/scene/plugins/blender/file/Pointer.java
  23. 1 1
      engine/src/blender/com/jme3/scene/plugins/blender/file/Structure.java
  24. 2 1
      engine/src/blender/com/jme3/scene/plugins/blender/lights/LightHelper.java
  25. 1 1
      engine/src/blender/com/jme3/scene/plugins/blender/materials/MaterialContext.java
  26. 1 1
      engine/src/blender/com/jme3/scene/plugins/blender/materials/MaterialHelper.java
  27. 1 1
      engine/src/blender/com/jme3/scene/plugins/blender/meshes/MeshHelper.java
  28. 1 1
      engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ArmatureModifier.java
  29. 2 1
      engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ArrayModifier.java
  30. 1 1
      engine/src/blender/com/jme3/scene/plugins/blender/modifiers/MirrorModifier.java
  31. 2 1
      engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ModifierHelper.java
  32. 1 1
      engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ObjectAnimationModifier.java
  33. 2 1
      engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ParticlesModifier.java
  34. 1 1
      engine/src/blender/com/jme3/scene/plugins/blender/objects/ObjectHelper.java
  35. 2 1
      engine/src/blender/com/jme3/scene/plugins/blender/objects/Properties.java
  36. 2 1
      engine/src/blender/com/jme3/scene/plugins/blender/particles/ParticlesHelper.java
  37. 2 1
      engine/src/blender/com/jme3/scene/plugins/blender/textures/ColorBand.java
  38. 2 1
      engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureHelper.java

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

@@ -38,7 +38,7 @@ import com.jme3.export.Savable;
 import com.jme3.math.FastMath;
 import com.jme3.math.Quaternion;
 import com.jme3.scene.Spatial;
-import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
+import com.jme3.scene.plugins.blender.file.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.Pointer;
 import com.jme3.scene.plugins.blender.file.Structure;
 import com.jme3.scene.plugins.blender.objects.Properties;

+ 1 - 1
engine/src/blender/com/jme3/scene/plugins/blender/AbstractBlenderLoader.java

@@ -46,7 +46,7 @@ import com.jme3.scene.LightNode;
 import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
 import com.jme3.scene.plugins.blender.cameras.CameraHelper;
-import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
+import com.jme3.scene.plugins.blender.file.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.Pointer;
 import com.jme3.scene.plugins.blender.file.Structure;
 import com.jme3.scene.plugins.blender.lights.LightHelper;

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

@@ -52,7 +52,7 @@ import com.jme3.scene.plugins.blender.animations.IpoHelper;
 import com.jme3.scene.plugins.blender.cameras.CameraHelper;
 import com.jme3.scene.plugins.blender.constraints.ConstraintHelper;
 import com.jme3.scene.plugins.blender.curves.CurvesHelper;
-import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
+import com.jme3.scene.plugins.blender.file.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.BlenderInputStream;
 import com.jme3.scene.plugins.blender.file.FileBlockHeader;
 import com.jme3.scene.plugins.blender.file.Structure;
@@ -135,9 +135,8 @@ public class BlenderLoader extends AbstractBlenderLoader {
             blenderContext.dispose();
             return loadingResults;
         } catch (BlenderFileException e) {
-            LOGGER.log(Level.SEVERE, e.getMessage(), e);
+            throw new IOException(e.getLocalizedMessage(), e);
         }
-        return null;
     }
 
     /**

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

@@ -42,7 +42,7 @@ import com.jme3.scene.LightNode;
 import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
 import com.jme3.scene.plugins.blender.constraints.ConstraintHelper;
-import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
+import com.jme3.scene.plugins.blender.file.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.FileBlockHeader;
 
 /**
@@ -84,8 +84,7 @@ public class BlenderModelLoader extends BlenderLoader {
             blenderContext.dispose();
             return modelRoot;
         } catch (BlenderFileException e) {
-            LOGGER.log(Level.SEVERE, e.getMessage(), e);
+            throw new IOException(e.getLocalizedMessage(), e);
         }
-        return null;
     }
 }

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

@@ -45,7 +45,7 @@ import com.jme3.math.Matrix4f;
 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.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.Pointer;
 import com.jme3.scene.plugins.blender.file.Structure;
 

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

@@ -9,7 +9,7 @@ import com.jme3.math.Matrix4f;
 import com.jme3.math.Quaternion;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.plugins.blender.BlenderContext;
-import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
+import com.jme3.scene.plugins.blender.file.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.Structure;
 import com.jme3.scene.plugins.blender.objects.ObjectHelper;
 

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

@@ -5,11 +5,12 @@ import com.jme3.math.Quaternion;
 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.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.List;
 import java.util.logging.Logger;
 

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

@@ -6,8 +6,9 @@ import com.jme3.renderer.Camera;
 import com.jme3.scene.CameraNode;
 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.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.Structure;
+
 import java.util.logging.Level;
 import java.util.logging.Logger;
 

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

@@ -10,7 +10,7 @@ import com.jme3.scene.plugins.blender.BlenderContext.LoadedFeatureDataType;
 import com.jme3.scene.plugins.blender.animations.ArmatureHelper;
 import com.jme3.scene.plugins.blender.animations.BoneContext;
 import com.jme3.scene.plugins.blender.animations.Ipo;
-import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
+import com.jme3.scene.plugins.blender.file.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.Structure;
 
 /**

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

@@ -8,7 +8,7 @@ import com.jme3.scene.plugins.blender.animations.Ipo;
 import com.jme3.scene.plugins.blender.constraints.ConstraintHelper.Space;
 import com.jme3.scene.plugins.blender.constraints.definitions.ConstraintDefinition;
 import com.jme3.scene.plugins.blender.constraints.definitions.ConstraintDefinitionFactory;
-import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
+import com.jme3.scene.plugins.blender.file.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.Pointer;
 import com.jme3.scene.plugins.blender.file.Structure;
 

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

@@ -22,7 +22,7 @@ import com.jme3.scene.plugins.blender.animations.ArmatureHelper;
 import com.jme3.scene.plugins.blender.animations.BoneContext;
 import com.jme3.scene.plugins.blender.animations.Ipo;
 import com.jme3.scene.plugins.blender.animations.IpoHelper;
-import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
+import com.jme3.scene.plugins.blender.file.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;

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

@@ -4,7 +4,7 @@ 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.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.Structure;
 
 /**

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

@@ -4,7 +4,7 @@ import com.jme3.math.Transform;
 import com.jme3.scene.plugins.blender.BlenderContext;
 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.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.Structure;
 
 /**

+ 1 - 1
engine/src/blender/com/jme3/scene/plugins/blender/constraints/definitions/ConstraintDefinitionFactory.java

@@ -36,7 +36,7 @@ import java.util.HashMap;
 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.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.Structure;
 
 public class ConstraintDefinitionFactory {

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

@@ -58,7 +58,7 @@ import com.jme3.scene.VertexBuffer.Type;
 import com.jme3.scene.mesh.IndexBuffer;
 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.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;

+ 1 - 1
engine/src/blender/com/jme3/scene/plugins/blender/exceptions/BlenderFileException.java → engine/src/blender/com/jme3/scene/plugins/blender/file/BlenderFileException.java

@@ -29,7 +29,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package com.jme3.scene.plugins.blender.exceptions;
+package com.jme3.scene.plugins.blender.file;
 
 /**
  * This exception is thrown when blend file data is somehow invalid.

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

@@ -38,8 +38,6 @@ import java.io.InputStream;
 import java.util.logging.Logger;
 import java.util.zip.GZIPInputStream;
 
-import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
-
 /**
  * An input stream with random access to data.
  * @author Marcin Roguski

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

@@ -32,7 +32,7 @@
 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.Map;
 

+ 3 - 5
engine/src/blender/com/jme3/scene/plugins/blender/file/DynamicArray.java

@@ -31,8 +31,6 @@
  */
 package com.jme3.scene.plugins.blender.file;
 
-import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
-
 /**
  * An array that can be dynamically modified/
  * @author Marcin Roguski
@@ -54,15 +52,15 @@ public class DynamicArray<T> implements Cloneable {
      * Constructor. Builds an empty array of the specified sizes.
      * @param tableSizes
      *            the sizes of the table
-     * @throws BlenderFileException
+     * @throws IllegalArgumentException
      *             an exception is thrown if one of the sizes is not a positive number
      */
-    public DynamicArray(int[] tableSizes, T[] data) throws BlenderFileException {
+    public DynamicArray(int[] tableSizes, T[] data) {
         this.tableSizes = tableSizes;
         int totalSize = 1;
         for (int size : tableSizes) {
             if (size <= 0) {
-                throw new BlenderFileException("The size of the table must be positive!");
+                throw new IllegalArgumentException("The size of the table must be positive!");
             }
             totalSize *= size;
         }

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

@@ -1,8 +1,8 @@
 package com.jme3.scene.plugins.blender.file;
 
 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;
 

+ 0 - 1
engine/src/blender/com/jme3/scene/plugins/blender/file/FileBlockHeader.java

@@ -32,7 +32,6 @@
 package com.jme3.scene.plugins.blender.file;
 
 import com.jme3.scene.plugins.blender.BlenderContext;
-import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
 
 /**
  * A class that holds the header data of a file block. The file block itself is not implemented. This class holds its

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

@@ -32,7 +32,7 @@
 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.ArrayList;
 import java.util.List;
 
@@ -91,7 +91,7 @@ public class Pointer {
         List<Structure> structures = null;
         FileBlockHeader dataFileBlock = blenderContext.getFileBlock(oldMemoryAddress);
         if (dataFileBlock == null) {
-            throw new BlenderFileException("No data stored for address: " + oldMemoryAddress + ". Rarely blender makes mistakes when storing data. Try resaving the model after making minor changes. This usually helps.");
+            throw new BlenderFileException("No data stored for address: " + oldMemoryAddress + ". Make sure you did not open the newer blender file with older blender version.");
         }
         if (pointerLevel > 1) {
             int pointersAmount = dataFileBlock.getSize() / inputStream.getPointerSize() * dataFileBlock.getCount();

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

@@ -32,7 +32,7 @@
 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;

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

@@ -42,8 +42,9 @@ import com.jme3.scene.LightNode;
 import com.jme3.scene.plugins.blender.AbstractBlenderHelper;
 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.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.Structure;
+
 import java.util.logging.Level;
 import java.util.logging.Logger;
 

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

@@ -20,7 +20,7 @@ import com.jme3.scene.VertexBuffer;
 import com.jme3.scene.VertexBuffer.Format;
 import com.jme3.scene.VertexBuffer.Usage;
 import com.jme3.scene.plugins.blender.BlenderContext;
-import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
+import com.jme3.scene.plugins.blender.file.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;

+ 1 - 1
engine/src/blender/com/jme3/scene/plugins/blender/materials/MaterialHelper.java

@@ -46,7 +46,7 @@ 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.BlenderContext.LoadedFeatureDataType;
-import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
+import com.jme3.scene.plugins.blender.file.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.Pointer;
 import com.jme3.scene.plugins.blender.file.Structure;
 import com.jme3.shader.VarType;

+ 1 - 1
engine/src/blender/com/jme3/scene/plugins/blender/meshes/MeshHelper.java

@@ -51,7 +51,7 @@ import com.jme3.scene.VertexBuffer.Usage;
 import com.jme3.scene.plugins.blender.AbstractBlenderHelper;
 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.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;

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

@@ -30,7 +30,7 @@ import com.jme3.scene.plugins.blender.BlenderContext.LoadedFeatureDataType;
 import com.jme3.scene.plugins.blender.animations.AnimationData;
 import com.jme3.scene.plugins.blender.animations.ArmatureHelper;
 import com.jme3.scene.plugins.blender.animations.BoneContext;
-import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
+import com.jme3.scene.plugins.blender.file.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.FileBlockHeader;
 import com.jme3.scene.plugins.blender.file.Pointer;
 import com.jme3.scene.plugins.blender.file.Structure;

+ 2 - 1
engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ArrayModifier.java

@@ -10,13 +10,14 @@ import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
 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.BlenderFileException;
 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.objects.ObjectHelper;
 import com.jme3.scene.shape.Curve;
+
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;

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

@@ -20,7 +20,7 @@ import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
 import com.jme3.scene.VertexBuffer.Type;
 import com.jme3.scene.plugins.blender.BlenderContext;
-import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
+import com.jme3.scene.plugins.blender.file.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;

+ 2 - 1
engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ModifierHelper.java

@@ -35,9 +35,10 @@ import com.jme3.scene.plugins.blender.AbstractBlenderHelper;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.animations.Ipo;
 import com.jme3.scene.plugins.blender.animations.IpoHelper;
-import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
+import com.jme3.scene.plugins.blender.file.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.HashSet;

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

@@ -15,7 +15,7 @@ import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.BlenderContext.LoadedFeatureDataType;
 import com.jme3.scene.plugins.blender.animations.AnimationData;
 import com.jme3.scene.plugins.blender.animations.Ipo;
-import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
+import com.jme3.scene.plugins.blender.file.BlenderFileException;
 
 /**
  * This modifier allows to add animation to the object.

+ 2 - 1
engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ParticlesModifier.java

@@ -9,11 +9,12 @@ import com.jme3.scene.Mesh;
 import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
 import com.jme3.scene.plugins.blender.BlenderContext;
-import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
+import com.jme3.scene.plugins.blender.file.BlenderFileException;
 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;

+ 1 - 1
engine/src/blender/com/jme3/scene/plugins/blender/objects/ObjectHelper.java

@@ -55,7 +55,7 @@ import com.jme3.scene.plugins.blender.animations.ArmatureHelper;
 import com.jme3.scene.plugins.blender.cameras.CameraHelper;
 import com.jme3.scene.plugins.blender.constraints.ConstraintHelper;
 import com.jme3.scene.plugins.blender.curves.CurvesHelper;
-import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
+import com.jme3.scene.plugins.blender.file.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;

+ 2 - 1
engine/src/blender/com/jme3/scene/plugins/blender/objects/Properties.java

@@ -1,11 +1,12 @@
 package com.jme3.scene.plugins.blender.objects;
 
 import com.jme3.scene.plugins.blender.BlenderContext;
-import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
+import com.jme3.scene.plugins.blender.file.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;

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

@@ -11,10 +11,11 @@ import com.jme3.effect.shapes.EmitterMeshVertexShape;
 import com.jme3.math.ColorRGBA;
 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.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 {

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

@@ -33,10 +33,11 @@ package com.jme3.scene.plugins.blender.textures;
 
 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.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;

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

@@ -32,6 +32,7 @@
 package com.jme3.scene.plugins.blender.textures;
 
 import com.jme3.asset.AssetInfo;
+
 import java.awt.color.ColorSpace;
 import java.awt.geom.AffineTransform;
 import java.awt.image.BufferedImage;
@@ -57,7 +58,7 @@ 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.BlenderContext.LoadedFeatureDataType;
-import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
+import com.jme3.scene.plugins.blender.file.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.FileBlockHeader;
 import com.jme3.scene.plugins.blender.file.Pointer;
 import com.jme3.scene.plugins.blender.file.Structure;