From f1587179810f5af6bf0a0a553a417404a9d92b77 Mon Sep 17 00:00:00 2001 From: "nor..67" Date: Wed, 30 Jan 2013 03:08:50 +0000 Subject: [PATCH] SDK: - fix Ogre binary importer asset list managing git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10236 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- .../ogretools/OgreBinaryMeshDataObject.java | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/sdk/jme3-ogretools/src/com/jme3/gde/ogretools/OgreBinaryMeshDataObject.java b/sdk/jme3-ogretools/src/com/jme3/gde/ogretools/OgreBinaryMeshDataObject.java index 25c708781..68ed373e6 100644 --- a/sdk/jme3-ogretools/src/com/jme3/gde/ogretools/OgreBinaryMeshDataObject.java +++ b/sdk/jme3-ogretools/src/com/jme3/gde/ogretools/OgreBinaryMeshDataObject.java @@ -61,7 +61,7 @@ public class OgreBinaryMeshDataObject extends SpatialAssetDataObject { listListener.start(); Spatial spatial = mgr.loadModel(assetKey); //replace transient xml files in list of assets for this model - replaceXmlFiles(); + replaceXmlFiles(mgr); listListener.stop(); savable = spatial; lock.releaseLock(); @@ -81,21 +81,18 @@ public class OgreBinaryMeshDataObject extends SpatialAssetDataObject { return null; } - private void replaceXmlFiles() { - List newFiles = new ArrayList(); - for (Iterator it = assetList.iterator(); it.hasNext();) { - FileObject fileObject = it.next(); + private void replaceXmlFiles(ProjectAssetManager mgr) { + for (int i = 0; i < assetList.size(); i++) { + FileObject fileObject = assetList.get(i); if (fileObject.hasExt("xml")) { FileObject binaryFile = fileObject.getParent().getFileObject(fileObject.getName()); if (binaryFile != null) { - newFiles.add(binaryFile); - it.remove(); + assetList.remove(i); + assetList.add(i, binaryFile); + assetKeyList.remove(i); + assetKeyList.add(i, new AssetKey(mgr.getRelativeAssetPath(binaryFile.getPath()))); } } } - for (Iterator it = newFiles.iterator(); it.hasNext();) { - FileObject fileObject = it.next(); - assetList.add(fileObject); - } } }