Browse Source

review fixes

rickard 3 years ago
parent
commit
946110fbd5

+ 8 - 8
jme3-core/src/com/jme3/gde/core/assets/ExternalChangeScanner.java

@@ -39,10 +39,10 @@ import com.jme3.gde.core.sceneexplorer.nodes.JmeNode;
 import com.jme3.gde.core.sceneexplorer.nodes.JmeSpatial;
 import com.jme3.gde.core.util.SpatialUtil;
 import com.jme3.gde.core.util.TaggedSpatialFinder;
-import com.jme3.gde.core.util.datatransfer.AnimationDataFromOriginal;
-import com.jme3.gde.core.util.datatransfer.MaterialDataFromOriginal;
-import com.jme3.gde.core.util.datatransfer.MeshDataFromOriginal;
-import com.jme3.gde.core.util.datatransfer.TransformDataFromOriginal;
+import com.jme3.gde.core.util.datatransfer.CopyAnimationDataFromOriginal;
+import com.jme3.gde.core.util.datatransfer.CopyMaterialDataFromOriginal;
+import com.jme3.gde.core.util.datatransfer.CopyMeshDataFromOriginal;
+import com.jme3.gde.core.util.datatransfer.CopyTransformDataFromOriginal;
 import com.jme3.scene.Spatial;
 import java.io.IOException;
 
@@ -161,16 +161,16 @@ public class ExternalChangeScanner implements AssetDataPropertyChangeListener,
             final TaggedSpatialFinder finder = new TaggedSpatialFinder();
 
             if(!onlyMeshData && SpatialUtil.hasAnimations(original)) {
-                new AnimationDataFromOriginal(finder).update(spat,
+                new CopyAnimationDataFromOriginal(finder).update(spat,
                             original);
                 
             }
             if(!onlyAnimData){
-                new MeshDataFromOriginal(finder).update(spat, original);
+                new CopyMeshDataFromOriginal(finder).update(spat, original);
             }
             if (!onlyMeshData && !onlyAnimData) {
-                new TransformDataFromOriginal(finder).update(spat, original);
-                new MaterialDataFromOriginal(finder).update(spat, original);
+                new CopyTransformDataFromOriginal(finder).update(spat, original);
+                new CopyMaterialDataFromOriginal(finder).update(spat, original);
             }
             // Do a complicated recurse refresh since AbstractSceneExplorerNode:refresh() isn't working
             SceneApplication.getApplication().enqueue((Runnable) () -> {

+ 0 - 4
jme3-core/src/com/jme3/gde/core/util/TaggedSpatialFinder.java

@@ -13,10 +13,6 @@ public class TaggedSpatialFinder {
     private static final Logger LOGGER =
             Logger.getLogger(TaggedSpatialFinder.class.getName());
     
-    public TaggedSpatialFinder() {
-        
-    }
-
     /**
      * Finds a previously marked spatial in the supplied root Spatial, creates
      * the name and path to be looked for from the given needle Spatial.

+ 3 - 3
jme3-core/src/com/jme3/gde/core/util/datatransfer/AnimationDataFromOriginal.java → jme3-core/src/com/jme3/gde/core/util/datatransfer/CopyAnimationDataFromOriginal.java

@@ -16,14 +16,14 @@ import java.util.logging.Logger;
 /**
  * Copies AnimComposer and AnimClips from an updated spatial to the original.
  */
-public final class AnimationDataFromOriginal implements SpatialDataTransferInterface {
+public final class CopyAnimationDataFromOriginal implements SpatialDataTransferInterface {
 
     private static final Logger LOGGER
-            = Logger.getLogger(AnimationDataFromOriginal.class.getName());
+            = Logger.getLogger(CopyAnimationDataFromOriginal.class.getName());
 
     private final TaggedSpatialFinder finder;
 
-    public AnimationDataFromOriginal(final TaggedSpatialFinder finder) {
+    public CopyAnimationDataFromOriginal(final TaggedSpatialFinder finder) {
         this.finder = finder;
     }
 

+ 5 - 7
jme3-core/src/com/jme3/gde/core/util/datatransfer/MaterialDataFromOriginal.java → jme3-core/src/com/jme3/gde/core/util/datatransfer/CopyMaterialDataFromOriginal.java

@@ -1,25 +1,23 @@
 package com.jme3.gde.core.util.datatransfer;
 
-import com.jme3.gde.core.scene.ApplicationLogHandler;
 import com.jme3.gde.core.util.TaggedSpatialFinder;
 import com.jme3.scene.Geometry;
-import com.jme3.scene.SceneGraphVisitor;
 import com.jme3.scene.SceneGraphVisitorAdapter;
 import com.jme3.scene.Spatial;
-
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
  * Copies material data from an updated model to the original.
  */
-public final class MaterialDataFromOriginal implements SpatialDataTransferInterface {
+public final class CopyMaterialDataFromOriginal implements SpatialDataTransferInterface {
 
     private static final Logger LOGGER =
-            Logger.getLogger(MaterialDataFromOriginal.class.getName());
+            Logger.getLogger(CopyMaterialDataFromOriginal.class.getName());
 
     private final TaggedSpatialFinder finder;
 
-    public MaterialDataFromOriginal(final TaggedSpatialFinder finder) {
+    public CopyMaterialDataFromOriginal(final TaggedSpatialFinder finder) {
         this.finder = finder;
     }
 
@@ -34,7 +32,7 @@ public final class MaterialDataFromOriginal implements SpatialDataTransferInterf
                 final Geometry spat = (Geometry) finder.find(root, geom);
                 if (spat != null && spat.getMaterial() != null && geom.getMaterial() != null) {
                     spat.setMaterial(geom.getMaterial());
-                    LOGGER.log(ApplicationLogHandler.LogLevel.FINE,
+                    LOGGER.log(Level.FINE,
                             "Updated material for Geometry {0}",
                             geom.getName());
                 }

+ 6 - 7
jme3-core/src/com/jme3/gde/core/util/datatransfer/MeshDataFromOriginal.java → jme3-core/src/com/jme3/gde/core/util/datatransfer/CopyMeshDataFromOriginal.java

@@ -1,6 +1,5 @@
 package com.jme3.gde.core.util.datatransfer;
 
-import com.jme3.gde.core.scene.ApplicationLogHandler.LogLevel;
 import com.jme3.gde.core.util.SpatialUtil;
 import com.jme3.gde.core.util.TaggedSpatialFinder;
 import com.jme3.scene.Geometry;
@@ -11,16 +10,16 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
- * Copies mesh data from an updated external file to the spatial
+ * Copies mesh data from an updated external file to the spatial.
  */
-public class MeshDataFromOriginal implements SpatialDataTransferInterface {
+public class CopyMeshDataFromOriginal implements SpatialDataTransferInterface {
 
     private static final Logger LOGGER =
-            Logger.getLogger(MeshDataFromOriginal.class.getName());
+            Logger.getLogger(CopyMeshDataFromOriginal.class.getName());
 
     private final TaggedSpatialFinder finder;
 
-    public MeshDataFromOriginal(final TaggedSpatialFinder finder) {
+    public CopyMeshDataFromOriginal(final TaggedSpatialFinder finder) {
         this.finder = finder;
     }
 
@@ -35,7 +34,7 @@ public class MeshDataFromOriginal implements SpatialDataTransferInterface {
                 final Geometry spat = (Geometry) finder.find(root, geom);
                 if (spat != null) {
                     spat.setMesh(geom.getMesh());
-                    LOGGER.log(LogLevel.USERINFO, "Updated mesh for Geometry "
+                    LOGGER.log(Level.INFO, "Updated mesh for Geometry "
                             + "{0}", geom.getName());
                 } else {
                     addLeafWithNonExistingParents(root, geom);
@@ -81,7 +80,7 @@ public class MeshDataFromOriginal implements SpatialDataTransferInterface {
                 //attach to new node in own root
                 Node otherNode = (Node) other;
                 otherNode.attachChild(s);
-                LOGGER.log(LogLevel.USERINFO, "Attached Node {0} with leaf "
+                LOGGER.log(Level.INFO, "Attached Node {0} with leaf "
                         + "{0}", new Object[]{other.getName(), leaf.getName()});
                 return;
             } else {

+ 6 - 7
jme3-core/src/com/jme3/gde/core/util/datatransfer/TransformDataFromOriginal.java → jme3-core/src/com/jme3/gde/core/util/datatransfer/CopyTransformDataFromOriginal.java

@@ -1,27 +1,26 @@
 package com.jme3.gde.core.util.datatransfer;
 
-import com.jme3.gde.core.scene.ApplicationLogHandler;
 import com.jme3.gde.core.util.TaggedSpatialFinder;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Node;
 import com.jme3.scene.SceneGraphVisitorAdapter;
 import com.jme3.scene.Spatial;
-
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
  * Copies Transform data (translation, rotation, scale) from an updated spatial
  * to the original.
  */
-public final class TransformDataFromOriginal implements 
+public final class CopyTransformDataFromOriginal implements 
         SpatialDataTransferInterface {
 
     private static final Logger LOGGER
-            = Logger.getLogger(AnimationDataFromOriginal.class.getName());
+            = Logger.getLogger(CopyAnimationDataFromOriginal.class.getName());
 
     private final TaggedSpatialFinder finder;
 
-    public TransformDataFromOriginal(final TaggedSpatialFinder finder) {
+    public CopyTransformDataFromOriginal(final TaggedSpatialFinder finder) {
         this.finder = finder;
     }
 
@@ -34,7 +33,7 @@ public final class TransformDataFromOriginal implements
                 final Geometry spat = (Geometry) finder.find(root, geom);
                 if (spat != null) {
                     spat.setLocalTransform(geom.getLocalTransform());
-                    LOGGER.log(ApplicationLogHandler.LogLevel.FINE,
+                    LOGGER.log(Level.FINE,
                             "Updated transform for Geometry {0}",
                             geom.getName());
                 }
@@ -45,7 +44,7 @@ public final class TransformDataFromOriginal implements
                 final Node spat = (Node) finder.find(root, node);
                 if (spat != null) {
                     spat.setLocalTransform(node.getLocalTransform());
-                    LOGGER.log(ApplicationLogHandler.LogLevel.FINE,
+                    LOGGER.log(Level.FINE,
                             "Updated transform for Node {0}", node.getName());
                 }
             }