From 52b40e7ae5332ef929eda7a4cc5c340d1bf91b08 Mon Sep 17 00:00:00 2001 From: "Kae..pl" Date: Tue, 21 Jun 2011 12:58:20 +0000 Subject: [PATCH] Refactoring. Moving Properties class to structures package. git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7681 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- .../scene/plugins/blender/helpers/v249/CurvesHelper.java | 2 +- .../jme3/scene/plugins/blender/helpers/v249/MeshHelper.java | 2 +- .../scene/plugins/blender/helpers/v249/ObjectHelper.java | 2 +- .../plugins/blender/{utils => structures}/Properties.java | 5 ++++- .../scene/plugins/blender/utils/AbstractBlenderHelper.java | 1 + 5 files changed, 8 insertions(+), 4 deletions(-) rename engine/src/blender/com/jme3/scene/plugins/blender/{utils => structures}/Properties.java (98%) diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/helpers/v249/CurvesHelper.java b/engine/src/blender/com/jme3/scene/plugins/blender/helpers/v249/CurvesHelper.java index 6733baf43..ffc954348 100644 --- a/engine/src/blender/com/jme3/scene/plugins/blender/helpers/v249/CurvesHelper.java +++ b/engine/src/blender/com/jme3/scene/plugins/blender/helpers/v249/CurvesHelper.java @@ -25,12 +25,12 @@ import com.jme3.scene.plugins.blender.data.FileBlockHeader; import com.jme3.scene.plugins.blender.data.Structure; import com.jme3.scene.plugins.blender.exception.BlenderFileException; import com.jme3.scene.plugins.blender.structures.BezierCurve; +import com.jme3.scene.plugins.blender.structures.Properties; import com.jme3.scene.plugins.blender.utils.AbstractBlenderHelper; import com.jme3.scene.plugins.blender.utils.BlenderInputStream; import com.jme3.scene.plugins.blender.utils.DataRepository; import com.jme3.scene.plugins.blender.utils.DynamicArray; import com.jme3.scene.plugins.blender.utils.Pointer; -import com.jme3.scene.plugins.blender.utils.Properties; import com.jme3.scene.shape.Curve; import com.jme3.scene.shape.Surface; import com.jme3.util.BufferUtils; diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/helpers/v249/MeshHelper.java b/engine/src/blender/com/jme3/scene/plugins/blender/helpers/v249/MeshHelper.java index 91b781ad4..3dd26747b 100644 --- a/engine/src/blender/com/jme3/scene/plugins/blender/helpers/v249/MeshHelper.java +++ b/engine/src/blender/com/jme3/scene/plugins/blender/helpers/v249/MeshHelper.java @@ -53,12 +53,12 @@ import com.jme3.scene.VertexBuffer.Type; import com.jme3.scene.VertexBuffer.Usage; import com.jme3.scene.plugins.blender.data.Structure; import com.jme3.scene.plugins.blender.exception.BlenderFileException; +import com.jme3.scene.plugins.blender.structures.Properties; import com.jme3.scene.plugins.blender.utils.AbstractBlenderHelper; import com.jme3.scene.plugins.blender.utils.DataRepository; import com.jme3.scene.plugins.blender.utils.DataRepository.LoadedFeatureDataType; import com.jme3.scene.plugins.blender.utils.DynamicArray; import com.jme3.scene.plugins.blender.utils.Pointer; -import com.jme3.scene.plugins.blender.utils.Properties; import com.jme3.texture.Texture; import com.jme3.util.BufferUtils; diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/helpers/v249/ObjectHelper.java b/engine/src/blender/com/jme3/scene/plugins/blender/helpers/v249/ObjectHelper.java index 033686f3f..9f99fb95c 100644 --- a/engine/src/blender/com/jme3/scene/plugins/blender/helpers/v249/ObjectHelper.java +++ b/engine/src/blender/com/jme3/scene/plugins/blender/helpers/v249/ObjectHelper.java @@ -57,12 +57,12 @@ import com.jme3.scene.plugins.blender.data.Structure; import com.jme3.scene.plugins.blender.exception.BlenderFileException; import com.jme3.scene.plugins.blender.structures.Ipo; import com.jme3.scene.plugins.blender.structures.Modifier; +import com.jme3.scene.plugins.blender.structures.Properties; import com.jme3.scene.plugins.blender.utils.AbstractBlenderHelper; import com.jme3.scene.plugins.blender.utils.DataRepository; import com.jme3.scene.plugins.blender.utils.DataRepository.LoadedFeatureDataType; import com.jme3.scene.plugins.blender.utils.DynamicArray; import com.jme3.scene.plugins.blender.utils.Pointer; -import com.jme3.scene.plugins.blender.utils.Properties; import com.jme3.scene.plugins.ogre.AnimData; /** diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/utils/Properties.java b/engine/src/blender/com/jme3/scene/plugins/blender/structures/Properties.java similarity index 98% rename from engine/src/blender/com/jme3/scene/plugins/blender/utils/Properties.java rename to engine/src/blender/com/jme3/scene/plugins/blender/structures/Properties.java index ed3a3e387..a828f4418 100644 --- a/engine/src/blender/com/jme3/scene/plugins/blender/utils/Properties.java +++ b/engine/src/blender/com/jme3/scene/plugins/blender/structures/Properties.java @@ -1,4 +1,4 @@ -package com.jme3.scene.plugins.blender.utils; +package com.jme3.scene.plugins.blender.structures; import java.io.IOException; import java.util.ArrayList; @@ -17,6 +17,9 @@ import com.jme3.export.Savable; import com.jme3.scene.plugins.blender.data.FileBlockHeader; import com.jme3.scene.plugins.blender.data.Structure; import com.jme3.scene.plugins.blender.exception.BlenderFileException; +import com.jme3.scene.plugins.blender.utils.BlenderInputStream; +import com.jme3.scene.plugins.blender.utils.DataRepository; +import com.jme3.scene.plugins.blender.utils.Pointer; /** * The blender object's custom properties. diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/utils/AbstractBlenderHelper.java b/engine/src/blender/com/jme3/scene/plugins/blender/utils/AbstractBlenderHelper.java index de4e84155..4a348b24e 100644 --- a/engine/src/blender/com/jme3/scene/plugins/blender/utils/AbstractBlenderHelper.java +++ b/engine/src/blender/com/jme3/scene/plugins/blender/utils/AbstractBlenderHelper.java @@ -36,6 +36,7 @@ import java.util.List; import com.jme3.scene.plugins.blender.data.Structure; import com.jme3.scene.plugins.blender.exception.BlenderFileException; +import com.jme3.scene.plugins.blender.structures.Properties; import com.jme3.util.BufferUtils; /**