Browse Source

AssetManager: adjust usage according to latest changes

shadowislord 10 years ago
parent
commit
e86e8a3dae

+ 0 - 1
jme3-materialeditor/src/com/jme3/gde/materials/MaterialPreviewRenderer.java

@@ -4,7 +4,6 @@
  */
  */
 package com.jme3.gde.materials;
 package com.jme3.gde.materials;
 
 
-import com.jme3.asset.DesktopAssetManager;
 import com.jme3.asset.MaterialKey;
 import com.jme3.asset.MaterialKey;
 import com.jme3.gde.core.assets.ProjectAssetManager;
 import com.jme3.gde.core.assets.ProjectAssetManager;
 import com.jme3.gde.core.scene.PreviewRequest;
 import com.jme3.gde.core.scene.PreviewRequest;

+ 1 - 2
jme3-materialeditor/src/com/jme3/gde/materials/MaterialPropertyEditor.java

@@ -31,7 +31,6 @@
  */
  */
 package com.jme3.gde.materials;
 package com.jme3.gde.materials;
 
 
-import com.jme3.asset.DesktopAssetManager;
 import com.jme3.gde.core.assets.ProjectAssetManager;
 import com.jme3.gde.core.assets.ProjectAssetManager;
 import com.jme3.gde.core.scene.SceneApplication;
 import com.jme3.gde.core.scene.SceneApplication;
 import com.jme3.gde.core.scene.SceneRequest;
 import com.jme3.gde.core.scene.SceneRequest;
@@ -148,7 +147,7 @@ public class MaterialPropertyEditor implements PropertyEditor, SceneExplorerProp
             SceneApplication.getApplication().enqueue(new Callable<Void>() {
             SceneApplication.getApplication().enqueue(new Callable<Void>() {
                 public Void call() throws Exception {
                 public Void call() throws Exception {
                     SceneRequest request = SceneApplication.getApplication().getCurrentSceneRequest();
                     SceneRequest request = SceneApplication.getApplication().getCurrentSceneRequest();
-                    ((DesktopAssetManager) request.getManager()).deleteFromCache(new MaterialKey(text));
+                    request.getManager().deleteFromCache(new MaterialKey(text));
                     Material localMaterial = request.getManager().loadMaterial(text);
                     Material localMaterial = request.getManager().loadMaterial(text);
                     if (localMaterial != null) {
                     if (localMaterial != null) {
                         material = localMaterial;
                         material = localMaterial;

+ 1 - 2
jme3-navmesh-gen/src/com/jme3/gde/nmgen/NavMeshAction.java

@@ -4,7 +4,6 @@
  */
  */
 package com.jme3.gde.nmgen;
 package com.jme3.gde.nmgen;
 
 
-import com.jme3.asset.DesktopAssetManager;
 import com.jme3.gde.core.assets.BinaryModelDataObject;
 import com.jme3.gde.core.assets.BinaryModelDataObject;
 import com.jme3.gde.core.assets.ProjectAssetManager;
 import com.jme3.gde.core.assets.ProjectAssetManager;
 import com.jme3.scene.Spatial;
 import com.jme3.scene.Spatial;
@@ -46,7 +45,7 @@ public class NavMeshAction implements ActionListener {
                     java.awt.EventQueue.invokeLater(new Runnable() {
                     java.awt.EventQueue.invokeLater(new Runnable() {
 
 
                         public void run() {
                         public void run() {
-                            ((DesktopAssetManager)manager.getManager()).clearCache();
+                            manager.getManager().clearCache();
                             NavMeshTopComponent composer = NavMeshTopComponent.findInstance();
                             NavMeshTopComponent composer = NavMeshTopComponent.findInstance();
                             composer.openScene(asset, context, manager);
                             composer.openScene(asset, context, manager);
                         }
                         }

+ 1 - 1
jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneEditorController.java

@@ -620,7 +620,7 @@ public class SceneEditorController implements PropertyChangeListener, NodeListen
                 AssetLinkNode linkNode = (AssetLinkNode) selected;
                 AssetLinkNode linkNode = (AssetLinkNode) selected;
                 linkNode.attachLinkedChild(manager, new ModelKey(assetName));
                 linkNode.attachLinkedChild(manager, new ModelKey(assetName));
             } else {
             } else {
-                ((DesktopAssetManager) manager).clearCache();
+                manager.clearCache();
                 ModelKey key = new ModelKey(assetName);
                 ModelKey key = new ModelKey(assetName);
                 AssetLinkNode linkNode = new AssetLinkNode(key);
                 AssetLinkNode linkNode = new AssetLinkNode(key);
                 linkNode.attachLinkedChildren(manager);
                 linkNode.attachLinkedChildren(manager);

+ 1 - 1
jme3-terrain-editor/src/com/jme3/gde/terraineditor/EditTerrainAction.java

@@ -69,7 +69,7 @@ public final class EditTerrainAction implements ActionListener {
                     java.awt.EventQueue.invokeLater(new Runnable() {
                     java.awt.EventQueue.invokeLater(new Runnable() {
 
 
                         public void run() {
                         public void run() {
-                            ((DesktopAssetManager)manager.getManager()).clearCache();
+                            manager.getManager().clearCache();
                             TerrainEditorTopComponent composer = TerrainEditorTopComponent.findInstance();
                             TerrainEditorTopComponent composer = TerrainEditorTopComponent.findInstance();
                             composer.openScene(asset, context, manager);
                             composer.openScene(asset, context, manager);
                         }
                         }