Browse Source

Performance analysis fixes

Toni Helenius 1 year ago
parent
commit
3b05cab3d0
26 changed files with 36 additions and 36 deletions
  1. 1 1
      jme3-android/src/com/jme3/gde/android/AndroidImportantFiles.java
  2. 2 2
      jme3-core/src/com/jme3/gde/core/appstates/NewAppStateVisualPanel1.java
  3. 1 1
      jme3-core/src/com/jme3/gde/core/assets/ProjectAssetManager.java
  4. 1 1
      jme3-core/src/com/jme3/gde/core/assets/nodes/AssetChildren.java
  5. 1 1
      jme3-core/src/com/jme3/gde/core/filters/AbstractFilterNode.java
  6. 1 1
      jme3-core/src/com/jme3/gde/core/j2seproject/actions/UpgradeProjectWizardPanel2.java
  7. 1 1
      jme3-core/src/com/jme3/gde/core/properties/TextureBrowser.java
  8. 4 4
      jme3-core/src/com/jme3/gde/core/properties/UserDataProperty.java
  9. 1 1
      jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeSpatial.java
  10. 4 4
      jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/UserDataDialog.java
  11. 1 1
      jme3-gui/src/com/jme3/gde/gui/swing/ConvertToNifty.java
  12. 1 1
      jme3-gui/src/com/jme3/gde/gui/view/NiftyGuiVisualElement.java
  13. 1 1
      jme3-materialeditor/src/com/jme3/gde/materialdefinition/dialog/AddNodeDialog.java
  14. 1 1
      jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/previews/VecPreview.java
  15. 1 1
      jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/UberStatement.java
  16. 1 1
      jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/leaves/LeafStatement.java
  17. 1 1
      jme3-materialeditor/src/com/jme3/gde/materials/MaterialBrowser.java
  18. 2 2
      jme3-materialeditor/src/com/jme3/gde/materials/MaterialPropertyEditor.java
  19. 1 1
      jme3-materialeditor/src/com/jme3/gde/materials/multiview/MaterialEditorTopComponent.java
  20. 1 1
      jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/FloatPanel.java
  21. 1 1
      jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/FloatPanelSmall.java
  22. 1 1
      jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/IntPanel.java
  23. 1 1
      jme3-materialeditor/src/com/jme3/gde/materials/nvcompress/NVCompress.java
  24. 1 1
      jme3-model-importer/src/com/jme3/gde/modelimporter/ModelImporterVisualPanel3.java
  25. 1 1
      jme3-terrain-editor/src/com/jme3/gde/terraineditor/CreateTerrainVisualPanel2.java
  26. 3 3
      jme3-terrain-editor/src/com/jme3/gde/terraineditor/TerrainEditorTopComponent.java

+ 1 - 1
jme3-android/src/com/jme3/gde/android/AndroidImportantFiles.java

@@ -82,7 +82,7 @@ public class AndroidImportantFiles implements ImportantFiles {
         } catch (DataObjectNotFoundException ex) {
             Exceptions.printStackTrace(ex);
         }
-        return list.toArray(new Node[list.size()]);
+        return list.toArray(Node[]::new);
     }
 
     @Override

+ 2 - 2
jme3-core/src/com/jme3/gde/core/appstates/NewAppStateVisualPanel1.java

@@ -31,6 +31,7 @@
  */
 package com.jme3.gde.core.appstates;
 
+import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -92,8 +93,7 @@ public final class NewAppStateVisualPanel1 extends JPanel {
                             ClassPath.getClassPath(sourceGroup.getRootFolder(), ClassPath.COMPILE),
                             ClassPath.getClassPath(sourceGroup.getRootFolder(), ClassPath.SOURCE));
 
-                    HashSet<SearchScope> set = new HashSet<SearchScope>();
-                    set.add(ClassIndex.SearchScope.SOURCE);
+                    Set<SearchScope> set = EnumSet.of(ClassIndex.SearchScope.SOURCE);
                     Set<ElementHandle<TypeElement>> types = cpInfo.getClassIndex().getDeclaredTypes("", NameKind.PREFIX, set);
                     for (Iterator<ElementHandle<TypeElement>> it = types.iterator(); it.hasNext();) {
                         final ElementHandle<TypeElement> elementHandle = it.next();

+ 1 - 1
jme3-core/src/com/jme3/gde/core/assets/ProjectAssetManager.java

@@ -659,7 +659,7 @@ public class ProjectAssetManager extends DesktopAssetManager {
      * @param folderName the folderName to set
      */
     public void setFolderName(String folderName) {
-        if (folderNames.size() > 0) {
+        if (!folderNames.isEmpty()) {
             this.folderNames.remove(0);
         }
         this.folderNames.add(0, folderName);

+ 1 - 1
jme3-core/src/com/jme3/gde/core/assets/nodes/AssetChildren.java

@@ -68,7 +68,7 @@ public class AssetChildren extends FilterNode.Children {
             }
         }
 
-        return result.toArray(new Node[0]);
+        return result.toArray(Node[]::new);
     }
 
     private boolean accept(Node node) {

+ 1 - 1
jme3-core/src/com/jme3/gde/core/filters/AbstractFilterNode.java

@@ -255,7 +255,7 @@ public abstract class AbstractFilterNode extends AbstractNode implements FilterN
             }
         }
         
-        return methodList.toArray(new Method[methodList.size()]);
+        return methodList.toArray(Method[]::new);
     }
     
     /**

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

@@ -148,7 +148,7 @@ public class UpgradeProjectWizardPanel2 implements WizardDescriptor.ValidatingPa
                         }
                     }
                     
-                    edProps.setProperty("javac.classpath", newClasspath.toArray(new String[newClasspath.size()]));
+                    edProps.setProperty("javac.classpath", newClasspath.toArray(String[]::new));
                     setProgress(60);
                     
                     if (edProps.getProperty("launch4j.exe.enabled") != null) {

+ 1 - 1
jme3-core/src/com/jme3/gde/core/properties/TextureBrowser.java

@@ -261,7 +261,7 @@ private void noTexturebuttonActionPerformed(java.awt.event.ActionEvent evt) {//G
         String[] leaves = assetManager.getTextures();
         List<String> leavesList = Arrays.asList(leaves);
         Collections.sort(leavesList);
-        TreeUtil.createTree(jTree1, leavesList.toArray(new String[0]));
+        TreeUtil.createTree(jTree1, leavesList.toArray(String[]::new));
         TreeUtil.expandTree(jTree1, (TreeNode) jTree1.getModel().getRoot(), 1);
         jTree1.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
         jTree1.addTreeSelectionListener(this);

+ 4 - 4
jme3-core/src/com/jme3/gde/core/properties/UserDataProperty.java

@@ -103,19 +103,19 @@ public class UserDataProperty extends PropertySupport.ReadWrite<String> {
                 public Void call() throws Exception {
                     switch (type) {
                         case 0:
-                            spatial.setUserData(name, Integer.parseInt(val));
+                            spatial.setUserData(name, Integer.valueOf(val));
                             break;
                         case 1:
-                            spatial.setUserData(name, Float.parseFloat(val));
+                            spatial.setUserData(name, Float.valueOf(val));
                             break;
                         case 2:
-                            spatial.setUserData(name, Boolean.parseBoolean(val));
+                            spatial.setUserData(name, Boolean.valueOf(val));
                             break;
                         case 3:
                             spatial.setUserData(name, val);
                             break;
                         case 4:
-                            spatial.setUserData(name, Long.parseLong(val));
+                            spatial.setUserData(name, Long.valueOf(val));
                             break;
                         default:
 //                            throw new UnsupportedOperationException();

+ 1 - 1
jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeSpatial.java

@@ -304,7 +304,7 @@ public class JmeSpatial extends AbstractSceneExplorerNode {
 
         //@TODO: multithreading.. but we only read
         Collection<String> dataKeys = spatial.getUserDataKeys();
-        if (dataKeys.size() > 0) {
+        if (!dataKeys.isEmpty()) {
             Sheet.Set set = Sheet.createPropertiesSet();
             set.setDisplayName("User Data");
             set.setName(Spatial.class.getName() + "_UserData");

+ 4 - 4
jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/UserDataDialog.java

@@ -163,13 +163,13 @@ public class UserDataDialog extends javax.swing.JDialog {
                     if (format.equals("String")) {
                         spatial.setUserData(name, data);
                     } else if (format.equals("Int")) {
-                        spatial.setUserData(name, Integer.parseInt(data));
+                        spatial.setUserData(name, Integer.valueOf(data));
                     } else if (format.equals("Float")) {
-                        spatial.setUserData(name, Float.parseFloat(data));
+                        spatial.setUserData(name, Float.valueOf(data));
                     } else if (format.equals("Boolean")) {
-                        spatial.setUserData(name, Boolean.parseBoolean(data));
+                        spatial.setUserData(name, Boolean.valueOf(data));
                     } else if (format.equals("Long")) {
-                        spatial.setUserData(name, Long.parseLong(data));
+                        spatial.setUserData(name, Long.valueOf(data));
                     } else if (userData != null) {
                         spatial.setUserData(name, userData);
                     }

+ 1 - 1
jme3-gui/src/com/jme3/gde/gui/swing/ConvertToNifty.java

@@ -71,7 +71,7 @@ public final class ConvertToNifty implements ActionListener {
                 }
             }
             for (SourceGroup sourceGroup : groups) {
-                ClassLoader loader = new URLClassLoader(urls.toArray(new URL[urls.size()]), this.getClass().getClassLoader());
+                ClassLoader loader = new URLClassLoader(urls.toArray(URL[]::new), this.getClass().getClassLoader());
                 try {
                     Class<?> clazzFactory = loader.loadClass("nl.tygron.niftyconverter.NiftyFactory");
                     Class<?> clazzFile = loader.loadClass("java.io.File");

+ 1 - 1
jme3-gui/src/com/jme3/gde/gui/view/NiftyGuiVisualElement.java

@@ -349,7 +349,7 @@ public final class NiftyGuiVisualElement extends JPanel implements MultiViewElem
             Collection<GLayer> layers1 = this.editor.getGui().getLayers();
             guiID = this.editor.getGui().getGUIid();
             this.editor.getGui().addObserver(this);
-            DefaultComboBoxModel<GLayer> model = new DefaultComboBoxModel<>(layers1.toArray(new GLayer[0]));
+            DefaultComboBoxModel<GLayer> model = new DefaultComboBoxModel<>(layers1.toArray(GLayer[]::new));
             layers.setModel(model);
             layers.setSelectedItem(this.editor.getCurrentLayer());
             

+ 1 - 1
jme3-materialeditor/src/com/jme3/gde/materialdefinition/dialog/AddNodeDialog.java

@@ -246,7 +246,7 @@ public class AddNodeDialog extends javax.swing.JDialog {
         List<String> l = new ArrayList<String>();
         l.addAll(mgr.getProjectShaderNodeDefs());
         l.addAll(mgr.getDependenciesShaderNodeDefs());
-        String[] leaves = l.toArray(new String[l.size()]);
+        String[] leaves = l.toArray(String[]::new);
         TreeUtil.createTree(jTree1, leaves);
         TreeUtil.expandTree(jTree1, (TreeNode) jTree1.getModel().getRoot(), 10);
         jTree1.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);

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

@@ -79,7 +79,7 @@ public class VecPreview extends BasePreview {
 
     private boolean verifyFloatString(String value) {
         try {
-            Float.parseFloat(value);
+            Float.valueOf(value);
         } catch (NumberFormatException ex) {
             logger.warning("Value is not valid float");
             return false;

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

@@ -32,7 +32,7 @@ public class UberStatement extends Statement {
 
     protected void fire(String propertyName, Object old, Object nue) {
         //Passing 0 below on purpose, so you only synchronize for one atomic call:
-        PropertyChangeListener[] pcls = (PropertyChangeListener[]) listeners.toArray(new PropertyChangeListener[0]);
+        PropertyChangeListener[] pcls = (PropertyChangeListener[]) listeners.toArray(PropertyChangeListener[]::new);
         for (int i = 0; i < pcls.length; i++) {
             pcls[i].propertyChange(new PropertyChangeEvent(this, propertyName, old, nue));
         }

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

@@ -31,7 +31,7 @@ public class LeafStatement extends Statement {
 
     protected void fire(String propertyName, Object old, Object nue) {
         //Passing 0 below on purpose, so you only synchronize for one atomic call:
-        PropertyChangeListener[] pcls = (PropertyChangeListener[]) listeners.toArray(new PropertyChangeListener[0]);
+        PropertyChangeListener[] pcls = (PropertyChangeListener[]) listeners.toArray(PropertyChangeListener[]::new);
         for (PropertyChangeListener pcl : pcls) {
             pcl.propertyChange(new PropertyChangeEvent(this, propertyName, old, nue));
         }

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

@@ -59,7 +59,7 @@ public class MaterialBrowser extends javax.swing.JDialog implements TreeSelectio
         String[] leaves = assetManager.getMaterials();
         List<String> leavesList = Arrays.asList(leaves);
         Collections.sort(leavesList);
-        TreeUtil.createTree(jTree1, leavesList.toArray(new String[0]));
+        TreeUtil.createTree(jTree1, leavesList.toArray(String[]::new));
         TreeUtil.expandTree(jTree1, (TreeNode) jTree1.getModel().getRoot(), 1);
         jTree1.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
         jTree1.addTreeSelectionListener(this);

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

@@ -178,7 +178,7 @@ public class MaterialPropertyEditor implements PropertyEditor, SceneExplorerProp
             String[] matsUnsorted = request.getManager().getMaterials();
             List<String> matList = Arrays.asList(matsUnsorted);
             Collections.sort(matList);
-            String[] materials = matList.toArray(new String[0]);
+            String[] materials = matList.toArray(String[]::new);
             String[] mats = new String[materials.length + 1];
             mats[0] = ("create j3m file");
             for (int i = 0; i < materials.length; i++) {
@@ -190,7 +190,7 @@ public class MaterialPropertyEditor implements PropertyEditor, SceneExplorerProp
             String[] matsUnsorted = request.getManager().getMaterials();
             List<String> matList = Arrays.asList(matsUnsorted);
             Collections.sort(matList);
-            return matList.toArray(new String[0]);
+            return matList.toArray(String[]::new);
         }
     }
 

+ 1 - 1
jme3-materialeditor/src/com/jme3/gde/materials/multiview/MaterialEditorTopComponent.java

@@ -587,7 +587,7 @@ public final class MaterialEditorTopComponent extends CloneableTopComponent impl
         jComboBox1.addItem("");
         List<String> matDefList = Arrays.asList(matDefs);
         Collections.sort(matDefList);
-        String[] sortedMatDefs = matDefList.toArray(new String[0]);
+        String[] sortedMatDefs = matDefList.toArray(String[]::new);
         for (String string : sortedMatDefs) {
             jComboBox1.addItem(string);
         }

+ 1 - 1
jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/FloatPanel.java

@@ -90,7 +90,7 @@ public class FloatPanel extends MaterialPropertyWidget {
                 MaterialProperty prop = property;
                 property = null;
                 try {
-                    jSpinner1.setValue(Float.parseFloat(prop.getValue()));
+                    jSpinner1.setValue(Float.valueOf(prop.getValue()));
                 } catch (Exception e) {
                     jSpinner1.setValue(0);
                 }

+ 1 - 1
jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/FloatPanelSmall.java

@@ -121,7 +121,7 @@ public class FloatPanelSmall extends MaterialPropertyWidget {
                 MaterialProperty prop = property;
                 property = null;
                 try {
-                    jSpinner1.setValue(Float.parseFloat(prop.getValue()));
+                    jSpinner1.setValue(Float.valueOf(prop.getValue()));
                 } catch (Exception e) {
                     jSpinner1.setValue(0);
                 }

+ 1 - 1
jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/IntPanel.java

@@ -87,7 +87,7 @@ public class IntPanel extends MaterialPropertyWidget {
                 MaterialProperty prop=property;
                 property=null;
                 try {
-                    jSpinner1.setValue(Integer.parseInt(prop.getValue()));
+                    jSpinner1.setValue(Integer.valueOf(prop.getValue()));
                 } catch (Exception e) {
                     jSpinner1.setValue(0);
                 }

+ 1 - 1
jme3-materialeditor/src/com/jme3/gde/materials/nvcompress/NVCompress.java

@@ -395,7 +395,7 @@ public class NVCompress extends javax.swing.JFrame {
             case 8: params.add("-bc5"); break;
         }
 
-        return params.toArray(new String[0]);
+        return params.toArray(String[]::new);
     }
 
     private void updateWork(String workStatus, int percent){

+ 1 - 1
jme3-model-importer/src/com/jme3/gde/modelimporter/ModelImporterVisualPanel3.java

@@ -106,7 +106,7 @@ public final class ModelImporterVisualPanel3 extends JPanel {
                 }
                 jList1.setListData(assetKeys.toArray());
                 jList2.setListData(failedKeys.toArray());
-                if (failedKeys.size() > 0) {
+                if (!failedKeys.isEmpty()) {
                     statusLabel.setText(org.openide.util.NbBundle.getMessage(ModelImporterVisualPanel3.class, "ModelImporterVisualPanel3.statusLabel.text_missing"));
                     infoTextArea.setText(org.openide.util.NbBundle.getMessage(ModelImporterVisualPanel3.class, "ModelImporterVisualPanel3.infoTextArea.text_missing"));
                 } else {

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

@@ -436,7 +436,7 @@ public final class CreateTerrainVisualPanel2 extends JPanel {
     
     public float getHeightScale() {
         try {
-            Float scale = Float.parseFloat(heightScale.getText());
+            Float scale = Float.valueOf(heightScale.getText());
             return Math.abs(scale);
         } catch (NumberFormatException e) {
             return 1;

+ 3 - 3
jme3-terrain-editor/src/com/jme3/gde/terraineditor/TerrainEditorTopComponent.java

@@ -792,7 +792,7 @@ public final class TerrainEditorTopComponent extends TopComponent implements Sce
 
     private void shininessFieldActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_shininessFieldActionPerformed
         try {
-            Float f = Float.parseFloat(shininessField.getText());
+            Float f = Float.valueOf(shininessField.getText());
             editorController.setShininess(Math.max(0, f));
         } catch (Exception e) {
             Logger.getLogger(TerrainEditorTopComponent.class.getName()).log(Level.WARNING,
@@ -936,7 +936,7 @@ public final class TerrainEditorTopComponent extends TopComponent implements Sce
             try {
                 javax.swing.JTextField textField = (javax.swing.JTextField)input;
                 String a=textField.getText();
-                Float.parseFloat(a);
+                Float.valueOf(a);
             }
             catch (NumberFormatException e) {
                 Toolkit.getDefaultToolkit().beep();
@@ -952,7 +952,7 @@ public final class TerrainEditorTopComponent extends TopComponent implements Sce
             if (input instanceof javax.swing.JTextField) {
                 String text = ((javax.swing.JTextField)input).getText();
                 try {
-                    Float f = Float.parseFloat(text);
+                    Float f = Float.valueOf(text);
                     if (f > 0)
                         return true;
                 } catch (Exception e) {