Browse Source

Logging analysis fixes

Toni Helenius 1 year ago
parent
commit
15fd4e113d

+ 2 - 1
jme3-core/src/com/jme3/gde/core/filters/actions/EnableFiterAction.java

@@ -41,6 +41,7 @@ import com.jme3.post.Filter;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.concurrent.Callable;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 public class EnableFiterAction implements ActionListener {
@@ -58,7 +59,7 @@ public class EnableFiterAction implements ActionListener {
             public Void call() throws Exception {
                 Filter filter=context.getFilter();
                 filter.setEnabled(!filter.isEnabled());                        
-                Logger.getLogger(EnableFiterAction.class.getName()).info( (filter.isEnabled()?"Enabled":"Disabled")+" "+filter.getName());
+                Logger.getLogger(EnableFiterAction.class.getName()).log(Level.INFO, "{0} {1}", new Object[]{filter.isEnabled()?"Enabled":"Disabled", filter.getName()});
                 context.propertyChange("PROP_USER_CHANGE", "Enabled", !filter.isEnabled(), filter.isEnabled());
               
                 return null;

+ 1 - 1
jme3-core/src/com/jme3/gde/core/j2seproject/ProjectExtensionManager.java

@@ -500,7 +500,7 @@ public class ProjectExtensionManager {
     private void writeFile(ZipInputStream str, FileObject fo) throws IOException {
         OutputStream out = fo.getOutputStream();
         try {
-            logger.log(Level.FINE, "Creating file " + fo.getNameExt());
+            logger.log(Level.FINE, "Creating file {0}", fo.getNameExt());
             FileUtil.copy(str, out);
         } finally {
             out.close();

+ 2 - 2
jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeTerrainGrid.java

@@ -115,7 +115,7 @@ public class JmeTerrainGrid extends JmeTerrainQuad implements TerrainGridListene
     }
 
     public void tileAttached(Vector3f vctrf, TerrainQuad tq) {
-        logger.log(Level.FINE, "Calling TerrainGrid update for node: {0}" + this);
+        logger.log(Level.FINE, "Calling TerrainGrid update for node: '{'0'}'{0}", this);
         java.awt.EventQueue.invokeLater(new Runnable() {
             public void run() {
                 refresh(false);
@@ -124,7 +124,7 @@ public class JmeTerrainGrid extends JmeTerrainQuad implements TerrainGridListene
     }
 
     public void tileDetached(Vector3f vctrf, TerrainQuad tq) {
-        logger.log(Level.FINE, "Calling TerrainGrid update for node: {0}" + this);
+        logger.log(Level.FINE, "Calling TerrainGrid update for node: '{'0'}'{0}", this);
         java.awt.EventQueue.invokeLater(new Runnable() {
             public void run() {
                 refresh(false);

+ 0 - 1
jme3-glsl-highlighter/src/com/jme3/gde/glsl/highlighter/lexer/GlslLexer.java

@@ -47,7 +47,6 @@ public class GlslLexer implements Lexer<GlslTokenID> {
 
     private final LexerInput lexerInput;
     private final TokenFactory<GlslTokenID> tokenFactory;
-    private final Logger log = Logger.getLogger(this.getClass().getCanonicalName());
 
     private String thisLineSoFar = "";
 

+ 1 - 1
jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/previews/BasePreview.java

@@ -48,7 +48,7 @@ import javax.swing.border.EmptyBorder;
 public abstract class BasePreview extends JPanel implements MaterialWidgetListener {
 
     private ShaderNodeVariable output;
-    protected Logger logger = Logger.getLogger(BasePreview.class.getName());
+    protected static final Logger logger = Logger.getLogger(BasePreview.class.getName());
 
     public interface OnDefaultValueChangedListener {
 

+ 1 - 1
jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/leaves/ConditionBlock.java

@@ -51,7 +51,7 @@ public class ConditionBlock extends LeafStatement {
             condition = split[1].trim();
 
         } catch (ArrayIndexOutOfBoundsException e) {
-            Logger.getLogger(ConditionBlock.class.getName()).log(Level.WARNING, "Parsing error line " + sta.getLineNumber() + " : " + sta.getLine());
+            Logger.getLogger(ConditionBlock.class.getName()).log(Level.WARNING, "Parsing error line {0} : {1}", new Object[]{sta.getLineNumber(), sta.getLine()});
         }
     }
 }

+ 1 - 1
jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/leaves/DefinitionBlock.java

@@ -66,7 +66,7 @@ public class DefinitionBlock extends LeafStatement {
 
 
         } catch (ArrayIndexOutOfBoundsException e) {
-            Logger.getLogger(DefinitionBlock.class.getName()).log(Level.WARNING, "Parsing error line " + sta.getLineNumber() + " : " + sta.getLine());
+            Logger.getLogger(DefinitionBlock.class.getName()).log(Level.WARNING, "Parsing error line {0} : {1}", new Object[]{sta.getLineNumber(), sta.getLine()});
         }
     }
 }

+ 1 - 1
jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/leaves/InputMappingBlock.java

@@ -63,7 +63,7 @@ public class InputMappingBlock extends MappingBlock {
             }
 
         } catch (ArrayIndexOutOfBoundsException e) {
-            Logger.getLogger(InputMappingBlock.class.getName()).log(Level.WARNING, "Parsing error line " + sta.getLineNumber() + " : " + sta.getLine());
+            Logger.getLogger(InputMappingBlock.class.getName()).log(Level.WARNING, "Parsing error line {0} : {1}", new Object[]{sta.getLineNumber(), sta.getLine()});
         }
     }
 }

+ 2 - 2
jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/leaves/LightModeBlock.java

@@ -54,9 +54,9 @@ public class LightModeBlock extends LeafStatement {
             TechniqueDef.LightMode.valueOf(lightMode);
 
         } catch (ArrayIndexOutOfBoundsException e) {           
-            Logger.getLogger(LightModeBlock.class.getName()).log(Level.WARNING, "Parsing error line " + sta.getLineNumber() + " : " + sta.getLine());
+            Logger.getLogger(LightModeBlock.class.getName()).log(Level.WARNING, "Parsing error line {0} : {1}", new Object[]{sta.getLineNumber(), sta.getLine()});
         } catch (IllegalArgumentException ex){
-            Logger.getLogger(LightModeBlock.class.getName()).log(Level.WARNING, "Invalid light mode : " + sta.getLineNumber() + " : " + sta.getLine());
+            Logger.getLogger(LightModeBlock.class.getName()).log(Level.WARNING, "Invalid light mode : {0} : {1}", new Object[]{sta.getLineNumber(), sta.getLine()});
         }
     }
 }

+ 1 - 1
jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/leaves/MatParamBlock.java

@@ -126,7 +126,7 @@ public class MatParamBlock extends LeafStatement {
 
         } catch (Exception e) {
             e.printStackTrace();
-            Logger.getLogger(MatParamBlock.class.getName()).log(Level.WARNING, "Parsing error line " + sta.getLineNumber() + " : " + sta.getLine());
+            Logger.getLogger(MatParamBlock.class.getName()).log(Level.WARNING, "Parsing error line {0} : {1}", new Object[]{sta.getLineNumber(), sta.getLine()});
         }
     }
 }

+ 2 - 2
jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/leaves/ShaderFileBlock.java

@@ -45,9 +45,9 @@ public class ShaderFileBlock extends LeafStatement {
             path = split[2].trim();
 
         } catch (ArrayIndexOutOfBoundsException e) {
-            Logger.getLogger(ShaderFileBlock.class.getName()).log(Level.WARNING, "Parsing error line " + sta.getLineNumber() + " : " + sta.getLine());
+            Logger.getLogger(ShaderFileBlock.class.getName()).log(Level.WARNING, "Parsing error line {0} : {1}", new Object[]{sta.getLineNumber(), sta.getLine()});
         } catch (IllegalArgumentException ex) {
-            Logger.getLogger(ShaderFileBlock.class.getName()).log(Level.WARNING, "Invalid light mode : " + sta.getLineNumber() + " : " + sta.getLine());
+            Logger.getLogger(ShaderFileBlock.class.getName()).log(Level.WARNING, "Invalid light mode : {0} : {1}", new Object[]{sta.getLineNumber(), sta.getLine()});
         }
     }
 }

+ 5 - 4
jme3-materialeditor/src/com/jme3/gde/materials/MaterialBrowser.java

@@ -21,6 +21,7 @@ import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.prefs.Preferences;
 import javax.swing.event.TreeSelectionEvent;
@@ -36,9 +37,9 @@ import org.openide.util.Exceptions;
  */
 public class MaterialBrowser extends javax.swing.JDialog implements TreeSelectionListener, WindowListener {
 
-    private ProjectAssetManager assetManager;
-    private MaterialPropertyEditor editor;
-    private Preferences prefs;
+    private final ProjectAssetManager assetManager;
+    private final MaterialPropertyEditor editor;
+    private final Preferences prefs;
     private static final String PREF_LAST_SELECTED = "lastSelectedMaterial";
 
     /** Creates new form MaterialBrowser */
@@ -83,7 +84,7 @@ public class MaterialBrowser extends javax.swing.JDialog implements TreeSelectio
 
     private void setSelectedMaterial(Material material) {
         if (material != null) {
-            Logger.getLogger(MaterialBrowser.class.getName()).finer("Looking for Texture: " + material.getAssetName());
+            Logger.getLogger(MaterialBrowser.class.getName()).log(Level.FINER, "Looking for Texture: {0}", material.getAssetName());
             String[] path = ("/" + material.getAssetName()).split("/");
             TreePath parent = new TreePath((TreeNode) jTree1.getModel().getRoot());
             jTree1.expandPath(TreeUtil.buildTreePath(jTree1, parent, path, 0, true));

+ 2 - 2
jme3-model-importer/src/com/jme3/gde/modelimporter/UberAssetLocator.java

@@ -153,7 +153,7 @@ public class UberAssetLocator implements AssetLocator {
             file = FileUtil.normalizeFile(file);
             FileObject fileObject = FileUtil.toFileObject(file);
             if (fileObject != null) {
-                logger.log(Level.INFO, "Found file {0}" + fileObject);
+                logger.log(Level.INFO, "Found file '{'0'}'{0}", fileObject);
                 return fileObject;
             }
         }
@@ -161,7 +161,7 @@ public class UberAssetLocator implements AssetLocator {
         file = FileUtil.normalizeFile(file);
         FileObject fileObject = FileUtil.toFileObject(file);
         if (fileObject != null) {
-            logger.log(Level.INFO, "Found file {0}" + fileObject);
+            logger.log(Level.INFO, "Found file '{'0'}'{0}", fileObject);
             return fileObject;
         }
         return getUserPath(key);