From b3195a3a2c5347adfdf44368149ad3c94b07af00 Mon Sep 17 00:00:00 2001 From: Ali-RS Date: Sun, 4 Apr 2021 22:15:16 +0430 Subject: [PATCH] =?UTF-8?q?Renamed=20DesktopAssetManager=20to=20DefaultAss?= =?UTF-8?q?etManager=20as=20it=20was=20a=20misnomer.=20It=E2=80=99s=20incl?= =?UTF-8?q?uded=20in=20jme3-core=20and=20used=20both=20on=20desktop=20and?= =?UTF-8?q?=20mobile=20platforms.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...tManager.java => DefaultAssetManager.java} | 10 +++++----- .../main/java/com/jme3/asset/ImplHandler.java | 2 +- .../com/jme3/system/JmeSystemDelegate.java | 6 +++--- .../com/jme3/asset/LoadShaderSourceTest.java | 2 +- .../collision/CollideIgnoreTransformTest.java | 4 ++-- .../com/jme3/scene/PhantomTrianglesTest.java | 4 ++-- .../com/jme3/scene/debug/TestCloneMesh.java | 20 +++++++++---------- .../test/java/com/jme3/system/TestUtil.java | 4 ++-- .../java/jme3test/app/TestCloneSpatial.java | 2 +- .../jme3/terrain/collision/BaseAWTTest.java | 2 +- 10 files changed, 28 insertions(+), 28 deletions(-) rename jme3-core/src/main/java/com/jme3/asset/{DesktopAssetManager.java => DefaultAssetManager.java} (98%) diff --git a/jme3-core/src/main/java/com/jme3/asset/DesktopAssetManager.java b/jme3-core/src/main/java/com/jme3/asset/DefaultAssetManager.java similarity index 98% rename from jme3-core/src/main/java/com/jme3/asset/DesktopAssetManager.java rename to jme3-core/src/main/java/com/jme3/asset/DefaultAssetManager.java index 50e372a6f7..329615b298 100644 --- a/jme3-core/src/main/java/com/jme3/asset/DesktopAssetManager.java +++ b/jme3-core/src/main/java/com/jme3/asset/DefaultAssetManager.java @@ -63,7 +63,7 @@ * * @author Kirill Vainer */ -public class DesktopAssetManager implements AssetManager { +public class DefaultAssetManager implements AssetManager { private static final Logger logger = Logger.getLogger(AssetManager.class.getName()); private ShaderGenerator shaderGenerator; @@ -76,19 +76,19 @@ public class DesktopAssetManager implements AssetManager { final private List classLoaders = Collections.synchronizedList(new ArrayList<>()); - public DesktopAssetManager(){ + public DefaultAssetManager(){ this(null); } - public DesktopAssetManager(boolean usePlatformConfig){ + public DefaultAssetManager(boolean usePlatformConfig){ this(usePlatformConfig ? JmeSystem.getPlatformAssetConfigURL() : null); } - public DesktopAssetManager(URL configFile){ + public DefaultAssetManager(URL configFile){ if (configFile != null){ loadConfigFile(configFile); } - logger.fine("DesktopAssetManager created."); + logger.fine("DefaultAssetManager created."); } private void loadConfigFile(URL configFile) { diff --git a/jme3-core/src/main/java/com/jme3/asset/ImplHandler.java b/jme3-core/src/main/java/com/jme3/asset/ImplHandler.java index 9e608ef509..ec5a9ecf5f 100644 --- a/jme3-core/src/main/java/com/jme3/asset/ImplHandler.java +++ b/jme3-core/src/main/java/com/jme3/asset/ImplHandler.java @@ -132,7 +132,7 @@ protected T initialValue(){ /** * Establishes the asset key that is used for tracking dependent assets - * that have failed to load. When set, the {@link DesktopAssetManager} + * that have failed to load. When set, the {@link DefaultAssetManager} * gets a hint that it should suppress {@link AssetNotFoundException}s * and instead call the listener callback (if set). * diff --git a/jme3-core/src/main/java/com/jme3/system/JmeSystemDelegate.java b/jme3-core/src/main/java/com/jme3/system/JmeSystemDelegate.java index f6f4c8912d..ecd4ea668c 100644 --- a/jme3-core/src/main/java/com/jme3/system/JmeSystemDelegate.java +++ b/jme3-core/src/main/java/com/jme3/system/JmeSystemDelegate.java @@ -32,7 +32,7 @@ package com.jme3.system; import com.jme3.asset.AssetManager; -import com.jme3.asset.DesktopAssetManager; +import com.jme3.asset.DefaultAssetManager; import com.jme3.audio.AudioRenderer; import com.jme3.input.SoftTextDialogInput; import java.io.File; @@ -122,11 +122,11 @@ public SoftTextDialogInput getSoftTextDialogInput() { } public final AssetManager newAssetManager(URL configFile) { - return new DesktopAssetManager(configFile); + return new DefaultAssetManager(configFile); } public final AssetManager newAssetManager() { - return new DesktopAssetManager(null); + return new DefaultAssetManager(null); } public abstract void writeImageFile(OutputStream outStream, String format, ByteBuffer imageData, int width, int height) throws IOException; diff --git a/jme3-core/src/test/java/com/jme3/asset/LoadShaderSourceTest.java b/jme3-core/src/test/java/com/jme3/asset/LoadShaderSourceTest.java index e4f3e57a8b..2cf3a0a98a 100644 --- a/jme3-core/src/test/java/com/jme3/asset/LoadShaderSourceTest.java +++ b/jme3-core/src/test/java/com/jme3/asset/LoadShaderSourceTest.java @@ -42,7 +42,7 @@ public class LoadShaderSourceTest { @Test public void testLoadShaderSource() { JmeSystem.setSystemDelegate(new MockJmeSystemDelegate()); - AssetManager assetManager = new DesktopAssetManager(); + AssetManager assetManager = new DefaultAssetManager(); assetManager.registerLocator(null, ClasspathLocator.class); assetManager.registerLoader(GLSLLoader.class, "frag"); assetManager.registerLoader(GLSLLoader.class, "glsllib"); diff --git a/jme3-core/src/test/java/com/jme3/collision/CollideIgnoreTransformTest.java b/jme3-core/src/test/java/com/jme3/collision/CollideIgnoreTransformTest.java index e098c22ba7..bf8f4cc7ad 100644 --- a/jme3-core/src/test/java/com/jme3/collision/CollideIgnoreTransformTest.java +++ b/jme3-core/src/test/java/com/jme3/collision/CollideIgnoreTransformTest.java @@ -32,7 +32,7 @@ package com.jme3.collision; import com.jme3.asset.AssetManager; -import com.jme3.asset.DesktopAssetManager; +import com.jme3.asset.DefaultAssetManager; import com.jme3.asset.plugins.ClasspathLocator; import com.jme3.material.Material; import com.jme3.material.plugins.J3MLoader; @@ -90,7 +90,7 @@ void createRedSquare() { @Test public void testPhantomTriangles() { JmeSystem.setSystemDelegate(new MockJmeSystemDelegate()); - assetManager = new DesktopAssetManager(); + assetManager = new DefaultAssetManager(); assetManager.registerLocator(null, ClasspathLocator.class); assetManager.registerLoader(J3MLoader.class, "j3m", "j3md"); rootNode = new Node(); diff --git a/jme3-core/src/test/java/com/jme3/scene/PhantomTrianglesTest.java b/jme3-core/src/test/java/com/jme3/scene/PhantomTrianglesTest.java index 8f885c53e2..9844f4d7c3 100644 --- a/jme3-core/src/test/java/com/jme3/scene/PhantomTrianglesTest.java +++ b/jme3-core/src/test/java/com/jme3/scene/PhantomTrianglesTest.java @@ -32,7 +32,7 @@ package com.jme3.scene; import com.jme3.asset.AssetManager; -import com.jme3.asset.DesktopAssetManager; +import com.jme3.asset.DefaultAssetManager; import com.jme3.asset.plugins.ClasspathLocator; import com.jme3.collision.CollisionResult; import com.jme3.collision.CollisionResults; @@ -117,7 +117,7 @@ void createWhiteLines() { @Test public void testPhantomTriangles() { JmeSystem.setSystemDelegate(new MockJmeSystemDelegate()); - assetManager = new DesktopAssetManager(); + assetManager = new DefaultAssetManager(); assetManager.registerLocator(null, ClasspathLocator.class); assetManager.registerLoader(J3MLoader.class, "j3m", "j3md"); rootNode = new Node(); diff --git a/jme3-core/src/test/java/com/jme3/scene/debug/TestCloneMesh.java b/jme3-core/src/test/java/com/jme3/scene/debug/TestCloneMesh.java index addc011418..c6c54b3567 100644 --- a/jme3-core/src/test/java/com/jme3/scene/debug/TestCloneMesh.java +++ b/jme3-core/src/test/java/com/jme3/scene/debug/TestCloneMesh.java @@ -34,7 +34,7 @@ import com.jme3.animation.Bone; import com.jme3.animation.Skeleton; import com.jme3.asset.AssetManager; -import com.jme3.asset.DesktopAssetManager; +import com.jme3.asset.DefaultAssetManager; import com.jme3.export.binary.BinaryExporter; import com.jme3.math.Vector3f; import com.jme3.util.clone.Cloner; @@ -63,7 +63,7 @@ public void testCloneArrow() { Assert.assertNotNull(deepClone); Assert.assertNotEquals(deepClone, arrow); - AssetManager assetManager = new DesktopAssetManager(); + AssetManager assetManager = new DefaultAssetManager(); Arrow saveAndLoad = BinaryExporter.saveAndLoad(assetManager, arrow); Assert.assertNotNull(saveAndLoad); Assert.assertNotEquals(deepClone, saveAndLoad); @@ -80,7 +80,7 @@ public void testCloneGrid() { Assert.assertNotNull(deepClone); Assert.assertNotEquals(deepClone, grid); - AssetManager assetManager = new DesktopAssetManager(); + AssetManager assetManager = new DefaultAssetManager(); Grid saveAndLoad = BinaryExporter.saveAndLoad(assetManager, grid); Assert.assertNotNull(saveAndLoad); Assert.assertNotEquals(deepClone, saveAndLoad); @@ -103,7 +103,7 @@ public void testCloneSkeletonDebugger() { Assert.assertNotNull(deepClone); Assert.assertNotEquals(deepClone, skeletonDebugger); - AssetManager assetManager = new DesktopAssetManager(); + AssetManager assetManager = new DefaultAssetManager(); SkeletonDebugger saveAndLoad = BinaryExporter.saveAndLoad(assetManager, skeletonDebugger); Assert.assertNotNull(saveAndLoad); @@ -130,7 +130,7 @@ public void testCloneSkeletonInterBoneWire() { Assert.assertNotNull(deepClone); Assert.assertNotEquals(deepClone, sibw); - AssetManager assetManager = new DesktopAssetManager(); + AssetManager assetManager = new DefaultAssetManager(); SkeletonInterBoneWire saveAndLoad = BinaryExporter.saveAndLoad(assetManager, sibw); Assert.assertNotNull(saveAndLoad); @@ -153,7 +153,7 @@ public void testCloneSkeletonPoints() { Assert.assertNotNull(deepClone); Assert.assertNotEquals(deepClone, skeletonPoints); - AssetManager assetManager = new DesktopAssetManager(); + AssetManager assetManager = new DefaultAssetManager(); SkeletonPoints saveAndLoad = BinaryExporter.saveAndLoad(assetManager, skeletonPoints); Assert.assertNotNull(saveAndLoad); @@ -175,7 +175,7 @@ public void testCloneSkeletonWire() { Assert.assertNotNull(deepClone); Assert.assertNotEquals(deepClone, skeletonWire); - AssetManager assetManager = new DesktopAssetManager(); + AssetManager assetManager = new DefaultAssetManager(); SkeletonWire saveAndLoad = BinaryExporter.saveAndLoad(assetManager, skeletonWire); Assert.assertNotNull(saveAndLoad); @@ -193,7 +193,7 @@ public void testCloneWireBox() { Assert.assertNotNull(deepClone); Assert.assertNotEquals(deepClone, box); - AssetManager assetManager = new DesktopAssetManager(); + AssetManager assetManager = new DefaultAssetManager(); WireBox saveAndLoad = BinaryExporter.saveAndLoad(assetManager, box); Assert.assertNotNull(saveAndLoad); Assert.assertNotEquals(deepClone, saveAndLoad); @@ -210,7 +210,7 @@ public void testCloneWireSphere() { Assert.assertNotNull(deepClone); Assert.assertNotEquals(deepClone, sphere); - AssetManager assetManager = new DesktopAssetManager(); + AssetManager assetManager = new DefaultAssetManager(); WireSphere saveAndLoad = BinaryExporter.saveAndLoad(assetManager, sphere); Assert.assertNotNull(saveAndLoad); @@ -231,7 +231,7 @@ public void testIssue1462() { Assert.assertNotNull(deepClone); Assert.assertNotEquals(deepClone, wireFrustum); - AssetManager assetManager = new DesktopAssetManager(); + AssetManager assetManager = new DefaultAssetManager(); WireFrustum saveAndLoad = BinaryExporter.saveAndLoad(assetManager, wireFrustum); Assert.assertNotNull(saveAndLoad); diff --git a/jme3-core/src/test/java/com/jme3/system/TestUtil.java b/jme3-core/src/test/java/com/jme3/system/TestUtil.java index ba6b833252..d5a94ee1bd 100644 --- a/jme3-core/src/test/java/com/jme3/system/TestUtil.java +++ b/jme3-core/src/test/java/com/jme3/system/TestUtil.java @@ -33,7 +33,7 @@ import com.jme3.asset.AssetConfig; import com.jme3.asset.AssetManager; -import com.jme3.asset.DesktopAssetManager; +import com.jme3.asset.DefaultAssetManager; import com.jme3.renderer.RenderManager; import java.util.logging.Level; import java.util.logging.Logger; @@ -52,7 +52,7 @@ private TestUtil() { public static AssetManager createAssetManager() { Logger.getLogger(AssetConfig.class.getName()).setLevel(Level.OFF); - return new DesktopAssetManager(true); + return new DefaultAssetManager(true); } public static RenderManager createRenderManager() { diff --git a/jme3-examples/src/main/java/jme3test/app/TestCloneSpatial.java b/jme3-examples/src/main/java/jme3test/app/TestCloneSpatial.java index 1c382f7987..fc4411e704 100644 --- a/jme3-examples/src/main/java/jme3test/app/TestCloneSpatial.java +++ b/jme3-examples/src/main/java/jme3test/app/TestCloneSpatial.java @@ -100,7 +100,7 @@ public static void main( String... args ) throws Exception { dump("", clone); System.out.println("-------- cloning BitmapText ------------"); - DesktopAssetManager assets = new DesktopAssetManager(true); + DefaultAssetManager assets = new DefaultAssetManager(true); BitmapFont font = assets.loadFont("Interface/Fonts/Console.fnt"); BitmapText text1 = new BitmapText(font); text1.setText("Testing"); diff --git a/jme3-terrain/src/test/java/com/jme3/terrain/collision/BaseAWTTest.java b/jme3-terrain/src/test/java/com/jme3/terrain/collision/BaseAWTTest.java index f1b218b9c6..06cb0aad9e 100644 --- a/jme3-terrain/src/test/java/com/jme3/terrain/collision/BaseAWTTest.java +++ b/jme3-terrain/src/test/java/com/jme3/terrain/collision/BaseAWTTest.java @@ -6,7 +6,7 @@ /** * This class provides some utility functions to properly test the jMonkeyEngine.
* Thus it contains simple methods to get and create a headless assetManager amongst other things.
- * In comparison to {@link BaseTest} it provides a DesktopAssetManager capable of loading image formats using AWT, which + * In comparison to {@link BaseTest} it provides a DefaultAssetManager capable of loading image formats using AWT, which * however makes those tests unsuitable for headless ci testing. This requires jme3-desktop to be a testRuntime dependency. * * @author MeFisto94