Browse Source

Merge pull request #573 from tonihele/feature/java21-code-cleanup

Feature/java21 code cleanup
Toni Helenius 1 year ago
parent
commit
278983675f
100 changed files with 369 additions and 465 deletions
  1. 3 2
      ant-jme/src/com/jme/ant/LoadWikiImages.java
  2. 1 1
      jme3-android/src/com/jme3/gde/android/AndroidImportantFiles.java
  3. 3 3
      jme3-android/src/com/jme3/gde/android/Installer.java
  4. 0 2
      jme3-assetbrowser/src/com/jme3/gde/assetbrowser/AssetBrowser.java
  5. 0 1
      jme3-assetbrowser/src/com/jme3/gde/assetbrowser/AssetBrowserTopComponent.java
  6. 0 1
      jme3-assetpack-support/src/com/jme3/gde/assetpack/AssetPackLoader.java
  7. 2 1
      jme3-assetpack-support/src/com/jme3/gde/assetpack/browser/OnlineBrowser.java
  8. 0 1
      jme3-assetpack-support/src/com/jme3/gde/assetpack/browser/properties/SelectionPropertyEditor.java
  9. 2 2
      jme3-assetpack-support/src/com/jme3/gde/assetpack/online/OnlinePacksConnector.java
  10. 22 16
      jme3-assetpack-support/src/com/jme3/gde/assetpack/project/AssetPackProject.java
  11. 0 1
      jme3-assetpack-support/src/com/jme3/gde/assetpack/project/wizards/CreateProjectWizardPanel1.java
  12. 9 12
      jme3-assetpack-support/src/com/jme3/gde/assetpack/project/wizards/ImportVisualPanel2.java
  13. 2 1
      jme3-blender/src/com/jme3/gde/blender/scripts/Scripts.java
  14. 6 6
      jme3-core/src/com/jme3/gde/core/appstates/AppStateNode.java
  15. 2 3
      jme3-core/src/com/jme3/gde/core/appstates/NewAppStateVisualPanel1.java
  16. 13 14
      jme3-core/src/com/jme3/gde/core/assets/ProjectAssetManager.java
  17. 0 1
      jme3-core/src/com/jme3/gde/core/assets/SpatialAssetDataObject.java
  18. 0 2
      jme3-core/src/com/jme3/gde/core/assets/actions/ConvertModel.java
  19. 1 1
      jme3-core/src/com/jme3/gde/core/assets/nodes/AssetChildren.java
  20. 8 6
      jme3-core/src/com/jme3/gde/core/codeless/CodelessProject.java
  21. 0 1
      jme3-core/src/com/jme3/gde/core/codeless/CodelessProjectLogicalView.java
  22. 0 1
      jme3-core/src/com/jme3/gde/core/completion/ModelGenerator.java
  23. 2 6
      jme3-core/src/com/jme3/gde/core/dnd/AssetTransferable.java
  24. 0 1
      jme3-core/src/com/jme3/gde/core/dnd/MaterialDropTargetListener.java
  25. 0 1
      jme3-core/src/com/jme3/gde/core/editor/nodes/NodePanel.java
  26. 1 1
      jme3-core/src/com/jme3/gde/core/filters/AbstractFilterNode.java
  27. 2 1
      jme3-core/src/com/jme3/gde/core/filters/actions/EnableFiterAction.java
  28. 0 1
      jme3-core/src/com/jme3/gde/core/filters/impl/JmeFilter.java
  29. 0 1
      jme3-core/src/com/jme3/gde/core/icons/IconList.java
  30. 4 3
      jme3-core/src/com/jme3/gde/core/j2seproject/ProjectExtensionManager.java
  31. 1 1
      jme3-core/src/com/jme3/gde/core/j2seproject/actions/UpgradeProjectWizardPanel2.java
  32. 4 5
      jme3-core/src/com/jme3/gde/core/properties/ColorRGBAPropertyEditor.java
  33. 26 20
      jme3-core/src/com/jme3/gde/core/properties/EmitterShapePropertyEditor.java
  34. 3 9
      jme3-core/src/com/jme3/gde/core/properties/LightPropertyEditor.java
  35. 1 1
      jme3-core/src/com/jme3/gde/core/properties/TextureBrowser.java
  36. 7 9
      jme3-core/src/com/jme3/gde/core/properties/UserDataProperty.java
  37. 18 13
      jme3-core/src/com/jme3/gde/core/properties/preview/TexturePreview.java
  38. 2 2
      jme3-core/src/com/jme3/gde/core/scene/SceneApplication.java
  39. 36 43
      jme3-core/src/com/jme3/gde/core/scene/controller/AbstractCameraController.java
  40. 9 7
      jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/AbstractSceneExplorerNode.java
  41. 1 1
      jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeSpatial.java
  42. 1 2
      jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeSpatialChildren.java
  43. 2 2
      jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeTerrainGrid.java
  44. 0 3
      jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeTerrainQuad.java
  45. 5 12
      jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeTrack.java
  46. 0 3
      jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/ExtractSubAnimationDialog.java
  47. 2 3
      jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/ParticleInfluencerPicker.java
  48. 4 4
      jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/UserDataDialog.java
  49. 2 3
      jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/UserDataPicker.java
  50. 0 2
      jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/animation/AnimClipProperty.java
  51. 1 1
      jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/NewCustomControlVisualPanel1.form
  52. 2 3
      jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/NewCustomControlVisualPanel1.java
  53. 2 1
      jme3-core/src/com/jme3/gde/core/util/ZipExtensionTool.java
  54. 0 1
      jme3-dark-laf/src/org/jme3/netbeans/plaf/darkmonkey/DMUtils.java
  55. 0 5
      jme3-dark-laf/src/org/jme3/netbeans/plaf/darkmonkey/DarkMonkeyIconFactory.java
  56. 0 4
      jme3-dark-laf/src/org/jme3/netbeans/plaf/darkmonkey/DarkMonkeyValidator.java
  57. 10 11
      jme3-desktop-executables/src/com/jme3/gde/desktop/executables/JreDownloader.java
  58. 47 52
      jme3-glsl-highlighter/src/com/jme3/gde/glsl/highlighter/lexer/GlslLexer.java
  59. 0 2
      jme3-gui/src/com/jme3/gde/gui/palette/NiftyGUIPaletteFactory.java
  60. 0 2
      jme3-gui/src/com/jme3/gde/gui/palette/WidgetChildFactory.java
  61. 0 10
      jme3-gui/src/com/jme3/gde/gui/palette/WidgetNode.java
  62. 0 2
      jme3-gui/src/com/jme3/gde/gui/propertyeditors/ResourceEditor.java
  63. 0 5
      jme3-gui/src/com/jme3/gde/gui/propertyeditors/SizeEditor.java
  64. 1 1
      jme3-gui/src/com/jme3/gde/gui/swing/ConvertToNifty.java
  65. 0 1
      jme3-gui/src/com/jme3/gde/gui/view/Navigator.java
  66. 11 15
      jme3-gui/src/com/jme3/gde/gui/view/NiftyGuiVisualElement.java
  67. 0 6
      jme3-materialeditor/src/com/jme3/gde/materialdefinition/EditableMatDefFile.java
  68. 1 1
      jme3-materialeditor/src/com/jme3/gde/materialdefinition/dialog/AddNodeDialog.java
  69. 13 15
      jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/MatDefEditorlElement.java
  70. 1 1
      jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/previews/BasePreview.java
  71. 1 1
      jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/previews/VecPreview.java
  72. 0 1
      jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/MaterialParametersBlock.java
  73. 38 35
      jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/ShaderNodeBlock.java
  74. 1 1
      jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/UberStatement.java
  75. 1 1
      jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/leaves/ConditionBlock.java
  76. 1 1
      jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/leaves/DefinitionBlock.java
  77. 1 1
      jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/leaves/InputMappingBlock.java
  78. 1 1
      jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/leaves/LeafStatement.java
  79. 2 2
      jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/leaves/LightModeBlock.java
  80. 1 1
      jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/leaves/MatParamBlock.java
  81. 2 2
      jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/leaves/ShaderFileBlock.java
  82. 0 2
      jme3-materialeditor/src/com/jme3/gde/materialdefinition/navigator/node/ShaderNodeNode.java
  83. 3 4
      jme3-materialeditor/src/com/jme3/gde/materialdefinition/navigator/node/properties/MatParamProperty.java
  84. 0 3
      jme3-materialeditor/src/com/jme3/gde/materialdefinition/navigator/node/properties/VectorInplaceEditor.java
  85. 6 5
      jme3-materialeditor/src/com/jme3/gde/materials/MaterialBrowser.java
  86. 0 1
      jme3-materialeditor/src/com/jme3/gde/materials/MaterialPreviewOpenSupport.java
  87. 2 2
      jme3-materialeditor/src/com/jme3/gde/materials/MaterialPropertyEditor.java
  88. 0 1
      jme3-materialeditor/src/com/jme3/gde/materials/dnd/TextureDropTargetListener.java
  89. 1 1
      jme3-materialeditor/src/com/jme3/gde/materials/multiview/MaterialEditorTopComponent.java
  90. 0 1
      jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/ColorPanel.java
  91. 2 2
      jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/FloatPanel.java
  92. 2 2
      jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/FloatPanelSmall.java
  93. 1 1
      jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/IntPanel.java
  94. 0 3
      jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/TextPanel.java
  95. 0 1
      jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/TexturePanelSquare.java
  96. 1 1
      jme3-materialeditor/src/com/jme3/gde/materials/nvcompress/NVCompress.java
  97. 0 1
      jme3-model-importer/src/com/jme3/gde/modelimporter/ImportKeyNode.java
  98. 1 1
      jme3-model-importer/src/com/jme3/gde/modelimporter/ModelImporterVisualPanel3.java
  99. 2 2
      jme3-model-importer/src/com/jme3/gde/modelimporter/UberAssetLocator.java
  100. 3 6
      jme3-navmesh-gen/src/com/jme3/gde/nmgen/NavMeshController.java

+ 3 - 2
ant-jme/src/com/jme/ant/LoadWikiImages.java

@@ -9,6 +9,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.InputStream;
+import java.net.URI;
 import java.net.URL;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Task;
@@ -48,7 +49,7 @@ public class LoadWikiImages extends Task {
                                 name = name.substring(0, markIdx);
                             }
                             name = name.replaceAll(":", "/");
-                            URL url = new URL(host + link);
+                            URL url = URI.create(host + link).toURL();
                             InputStream in = null;
                             FileOutputStream out = null;
                             try {
@@ -83,7 +84,7 @@ public class LoadWikiImages extends Task {
                             }
                             //make external folder and clean filename
                             name = "external/" + name.replaceAll("[_[^\\w\\däüöÄÜÖ\\/\\+\\-\\. ]]", "_");
-                            URL url = new URL(host + link);
+                            URL url = URI.create((host + link)).toURL();
                             InputStream in = url.openStream();
                             File file = new File(getLocation().getFileName().replaceAll("build.xml", "") + File.separator + targetFolder + File.separator + name.replaceAll("/", File.separator));
                             log("Getting external image: " + host + link);

+ 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

+ 3 - 3
jme3-android/src/com/jme3/gde/android/Installer.java

@@ -33,7 +33,7 @@ package com.jme3.gde.android;
 
 import com.jme3.gde.core.errorreport.ExceptionUtils;
 import java.net.MalformedURLException;
-import java.net.URL;
+import java.net.URI;
 import org.netbeans.api.autoupdate.UpdateUnitProvider;
 import org.netbeans.api.autoupdate.UpdateUnitProviderFactory;
 import org.openide.modules.ModuleInstall;
@@ -55,9 +55,9 @@ public class Installer extends ModuleInstall {
             if (implVers != null) {
                 try {
                     UpdateUnitProvider updateUnitProvider = UpdateUnitProviderFactory.getDefault()
-                                .create("NBANDROID", "NBANDROID Update Center", new URL(
+                                .create("NBANDROID", "NBANDROID Update Center", URI.create(
                                         String.format("http://server.arsi.sk:8080/updates/%s-updates.xml", implVers)
-                                ));
+                                ).toURL());
                     updateUnitProvider.setEnable(true);
                 } catch (MalformedURLException ex) {
                     ExceptionUtils.caughtException(ex, "Note: This could be a problem related to your internet connection/firewall etc.");

+ 0 - 2
jme3-assetbrowser/src/com/jme3/gde/assetbrowser/AssetBrowser.java

@@ -44,7 +44,6 @@ import com.jme3.gde.core.assets.ProjectAssetManager;
 import com.jme3.gde.core.util.ProjectSelection;
 import com.jme3.gde.materials.JMEMaterialDataObject;
 import com.jme3.gde.materials.multiview.MaterialOpenSupport;
-import com.jme3.gde.scenecomposer.OpenSceneComposer;
 import com.jme3.gde.scenecomposer.SceneComposerTopComponent;
 import com.jme3.gde.textureeditor.JmeTextureDataObject;
 import com.jme3.gde.textureeditor.OpenTexture;
@@ -62,7 +61,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.swing.JOptionPane;
-import org.netbeans.api.project.Project;
 import org.openide.DialogDisplayer;
 import org.openide.NotifyDescriptor;
 import org.openide.filesystems.FileAttributeEvent;

+ 0 - 1
jme3-assetbrowser/src/com/jme3/gde/assetbrowser/AssetBrowserTopComponent.java

@@ -36,7 +36,6 @@ import org.openide.awt.ActionID;
 import org.openide.awt.ActionReference;
 import org.openide.util.NbBundle;
 import org.openide.windows.TopComponent;
-import org.openide.util.NbBundle.Messages;
 
 /**
  * Top component which displays something.

+ 0 - 1
jme3-assetpack-support/src/com/jme3/gde/assetpack/AssetPackLoader.java

@@ -8,7 +8,6 @@ import com.jme3.asset.ModelKey;
 import com.jme3.gde.assetpack.actions.AddAssetAction;
 import com.jme3.gde.assetpack.project.wizards.FileDescription;
 import com.jme3.gde.core.assets.ProjectAssetManager;
-import com.jme3.gde.core.scene.SceneApplication;
 import com.jme3.material.Material;
 import com.jme3.material.MaterialList;
 import com.jme3.scene.Node;

+ 2 - 1
jme3-assetpack-support/src/com/jme3/gde/assetpack/browser/OnlineBrowser.java

@@ -14,6 +14,7 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.URI;
 import java.net.URL;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -43,7 +44,7 @@ public class OnlineBrowser extends javax.swing.JPanel implements HyperlinkListen
         this.lib = lib;
         jEditorPane1.addHyperlinkListener(this);
         try {
-            URL url = new URL("http://jmonkeyengine.org/assetpacks/list.php");
+            URL url = URI.create("http://jmonkeyengine.org/assetpacks/list.php").toURL();
             jEditorPane1.setPage(url);
         } catch (IOException ex) {
             Exceptions.printStackTrace(ex);

+ 0 - 1
jme3-assetpack-support/src/com/jme3/gde/assetpack/browser/properties/SelectionPropertyEditor.java

@@ -37,7 +37,6 @@ import java.awt.Rectangle;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyEditor;
-import java.util.Iterator;
 import java.util.ArrayList;
 import java.util.List;
 

+ 2 - 2
jme3-assetpack-support/src/com/jme3/gde/assetpack/online/OnlinePacksConnector.java

@@ -31,7 +31,7 @@ public class OnlinePacksConnector {
             int size = (int) FileUtil.toFileObject(file).getSize();
             Logger.getLogger(OnlinePacksConnector.class.getName()).log(Level.FINE, "Upload file size: {0}", size);
 
-            URL url = new URL(urlString);
+            URL url = URI.create(urlString).toURL();
             String boundary = MultiPartFormOutputStream.createBoundary();
             URLConnection urlConn = MultiPartFormOutputStream.createConnection(url);
             urlConn.setRequestProperty("Accept", "*/*");
@@ -77,7 +77,7 @@ public class OnlinePacksConnector {
 
     private static boolean test(String urlString, String user, String pass) {
         try {
-            URL url = new URL(urlString);
+            URL url = URI.create(urlString).toURL();
             String boundary = MultiPartFormOutputStream.createBoundary();
             URLConnection urlConn = MultiPartFormOutputStream.createConnection(url);
             urlConn.setRequestProperty("Accept", "*/*");

+ 22 - 16
jme3-assetpack-support/src/com/jme3/gde/assetpack/project/AssetPackProject.java

@@ -270,12 +270,14 @@ public class AssetPackProject implements Project {
 
         @Override
         public boolean isActionEnabled(String command, Lookup lookup) throws IllegalArgumentException {
-            if ((command.equals(ActionProvider.COMMAND_DELETE))) {
-                return true;
-            } else if ((command.equals(ActionProvider.COMMAND_COPY))) {
-                return true;
-            } else {
-                throw new IllegalArgumentException(command);
+            switch (command) {
+                case ActionProvider.COMMAND_DELETE -> {
+                    return true;
+                }
+                case ActionProvider.COMMAND_COPY -> {
+                    return true;
+                }
+                default -> throw new IllegalArgumentException(command);
             }
         }
     }
@@ -352,16 +354,20 @@ public class AssetPackProject implements Project {
 
         @Override
         public JComponent create(Category category) {
-            if (category.getName().equals("General")) {
-                panel1 =
-                        new GeneralSettingsPanel(project);
-                return panel1;
-            } else if (category.getName().equals("License")) {
-                panel2 =
-                        new LicensePanel(project);
-                return panel2;
-            } else {
-                return new JPanel();
+            switch (category.getName()) {
+                case "General" -> {
+                    panel1 =
+                            new GeneralSettingsPanel(project);
+                    return panel1;
+                }
+                case "License" -> {
+                    panel2 =
+                            new LicensePanel(project);
+                    return panel2;
+                }
+                default -> {
+                    return new JPanel();
+                }
             }
 
         }

+ 0 - 1
jme3-assetpack-support/src/com/jme3/gde/assetpack/project/wizards/CreateProjectWizardPanel1.java

@@ -5,7 +5,6 @@
 package com.jme3.gde.assetpack.project.wizards;
 
 import java.awt.Component;
-import java.io.File;
 import javax.swing.event.ChangeListener;
 import org.openide.WizardDescriptor;
 import org.openide.util.HelpCtx;

+ 9 - 12
jme3-assetpack-support/src/com/jme3/gde/assetpack/project/wizards/ImportVisualPanel2.java

@@ -86,18 +86,15 @@ public final class ImportVisualPanel2 extends JPanel {
     private String pathString() {
         String string = "";
         String type = (String) wiz.getProperty("type");
-        if (type.equals("model")) {
-            string += "/Models/";
-        } else if (type.equals("scene")) {
-            string += "/Scenes/";
-        } else if (type.equals("texture")) {
-            string += "/Textures/";
-        } else if (type.equals("sound")) {
-            string += "/Sounds/";
-        } else if (type.equals("shader")) {
-            string += "/Shaders/";
-        } else if (type.equals("other")) {
-            string += "/Misc/";
+        switch (type) {
+            case "model" -> string += "/Models/";
+            case "scene" -> string += "/Scenes/";
+            case "texture" -> string += "/Textures/";
+            case "sound" -> string += "/Sounds/";
+            case "shader" -> string += "/Shaders/";
+            case "other" -> string += "/Misc/";
+            default -> {
+            }
         }
         String category = ((String) wiz.getProperty("categories")).split(",")[0].trim();
         string += category + "/";

+ 2 - 1
jme3-blender/src/com/jme3/gde/blender/scripts/Scripts.java

@@ -7,6 +7,7 @@ package com.jme3.gde.blender.scripts;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.URI;
 import java.net.URL;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -41,7 +42,7 @@ public class Scripts {
                 InputStream in = null;
                 OutputStream out = null;
                 try {
-                    URL url = new URL("nbres:" + root + name);
+                    URL url = URI.create("nbres:" + root + name).toURL();
                     file = FileUtil.createData(folder, name);
                     in = url.openStream();
                     out = file.getOutputStream();

+ 6 - 6
jme3-core/src/com/jme3/gde/core/appstates/AppStateNode.java

@@ -199,12 +199,12 @@ public class AppStateNode extends AbstractNode implements ScenePropertyChangeLis
     }
 
     public void propertyChange(final String type, final String name, final Object before, final Object after) {
-        if (SceneExplorerProperty.PROP_USER_CHANGE.equals(type)) {
-            firePropertyChange(name, before, after);
-        } else if (SceneExplorerProperty.PROP_SCENE_CHANGE.equals(type)) {
-            firePropertyChange(name, before, after);
-        } else if (SceneExplorerProperty.PROP_INIT_CHANGE.equals(type)) {
-            firePropertyChange(name, before, after);
+        if (null != type) switch (type) {
+            case SceneExplorerProperty.PROP_USER_CHANGE -> firePropertyChange(name, before, after);
+            case SceneExplorerProperty.PROP_SCENE_CHANGE -> firePropertyChange(name, before, after);
+            case SceneExplorerProperty.PROP_INIT_CHANGE -> firePropertyChange(name, before, after);
+            default -> {
+            }
         }
     }
 }

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

@@ -31,7 +31,7 @@
  */
 package com.jme3.gde.core.appstates;
 
-import java.util.HashSet;
+import java.util.EnumSet;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -92,8 +92,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();

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

@@ -33,7 +33,6 @@ package com.jme3.gde.core.assets;
 
 import com.jme3.asset.AssetEventListener;
 import com.jme3.asset.AssetKey;
-import com.jme3.asset.AssetManager;
 import com.jme3.asset.DesktopAssetManager;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
@@ -87,12 +86,12 @@ public class ProjectAssetManager extends DesktopAssetManager {
     private static final Logger logger = Logger.getLogger(ProjectAssetManager.class.getName());
     private final Mutex mutex = new Mutex();
     private final Project project;
-    private final List<ClassPathChangeListener> classPathListeners = Collections.synchronizedList(new LinkedList<ClassPathChangeListener>());
-    private final List<ClassPath> classPaths = Collections.synchronizedList(new LinkedList<ClassPath>());
-    private final List<ClassPathItem> classPathItems = Collections.synchronizedList(new LinkedList<ClassPathItem>());
-    private final List<AssetEventListener> assetEventListeners = Collections.synchronizedList(new LinkedList<AssetEventListener>());
-    private final List<String> folderNames = new LinkedList<String>();
-    private final List<FileObject> jarItems = new LinkedList<FileObject>();
+    private final List<ClassPathChangeListener> classPathListeners = Collections.synchronizedList(new LinkedList<>());
+    private final List<ClassPath> classPaths = Collections.synchronizedList(new LinkedList<>());
+    private final List<ClassPathItem> classPathItems = Collections.synchronizedList(new LinkedList<>());
+    private final List<AssetEventListener> assetEventListeners = Collections.synchronizedList(new LinkedList<>());
+    private final List<String> folderNames = new LinkedList<>();
+    private final List<FileObject> jarItems = new LinkedList<>();
     private URLClassLoader loader;
 
     public ProjectAssetManager(Project prj, String folderName) {
@@ -275,12 +274,12 @@ public class ProjectAssetManager extends DesktopAssetManager {
     private PropertyChangeListener classPathListener = new PropertyChangeListener() {
         public void propertyChange(PropertyChangeEvent evt) {
             logger.log(Level.FINE, "Classpath event: {0}", evt);
-            if (ClassPath.PROP_ROOTS.equals(evt.getPropertyName())) {
-                updateClassLoader();
-            } else if (ClassPath.PROP_ENTRIES.equals(evt.getPropertyName())) {
-                updateClassLoader();
-            } else if (ClassPath.PROP_INCLUDES.equals(evt.getPropertyName())) {
-                updateClassLoader();
+            if (null != evt.getPropertyName()) switch (evt.getPropertyName()) {
+                case ClassPath.PROP_ROOTS -> updateClassLoader();
+                case ClassPath.PROP_ENTRIES -> updateClassLoader();
+                case ClassPath.PROP_INCLUDES -> updateClassLoader();
+                default -> {
+                }
             }
         }
     };
@@ -659,7 +658,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);

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

@@ -44,7 +44,6 @@ import org.openide.filesystems.FileObject;
 import org.openide.loaders.DataObject;
 import org.openide.loaders.DataObjectExistsException;
 import org.openide.loaders.MultiFileLoader;
-import org.openide.util.Exceptions;
 
 /**
  *

+ 0 - 2
jme3-core/src/com/jme3/gde/core/assets/actions/ConvertModel.java

@@ -32,7 +32,6 @@
 package com.jme3.gde.core.assets.actions;
 
 import com.jme3.export.Savable;
-import com.jme3.gde.core.assets.AssetDataObject;
 import com.jme3.gde.core.assets.BinaryModelDataObject;
 import com.jme3.gde.core.assets.SpatialAssetDataObject;
 import com.jme3.gde.core.util.notify.MessageUtil;
@@ -42,7 +41,6 @@ import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.netbeans.api.progress.ProgressHandle;
-import org.openide.util.Exceptions;
 
 public final class ConvertModel implements ActionListener {
     protected static final Logger logger = Logger.getLogger(ConvertModel.class.getName());

+ 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) {

+ 8 - 6
jme3-core/src/com/jme3/gde/core/codeless/CodelessProject.java

@@ -143,12 +143,14 @@ class CodelessProject implements Project {
 
         @Override
         public boolean isActionEnabled(String command, Lookup lookup) throws IllegalArgumentException {
-            if ((command.equals(ActionProvider.COMMAND_DELETE))) {
-                return true;
-            } else if ((command.equals(ActionProvider.COMMAND_COPY))) {
-                return true;
-            } else {
-                throw new IllegalArgumentException(command);
+            switch (command) {
+                case ActionProvider.COMMAND_DELETE -> {
+                    return true;
+                }
+                case ActionProvider.COMMAND_COPY -> {
+                    return true;
+                }
+                default -> throw new IllegalArgumentException(command);
             }
         }
     }

+ 0 - 1
jme3-core/src/com/jme3/gde/core/codeless/CodelessProjectLogicalView.java

@@ -15,7 +15,6 @@ import org.openide.nodes.AbstractNode;
 import org.openide.nodes.Children;
 import org.openide.nodes.Node;
 import org.openide.util.Exceptions;
-import org.openide.util.ImageUtilities;
 import org.openide.util.lookup.AbstractLookup;
 import org.openide.util.lookup.InstanceContent;
 

+ 0 - 1
jme3-core/src/com/jme3/gde/core/completion/ModelGenerator.java

@@ -36,7 +36,6 @@ import java.util.Collections;
 import java.util.List;
 import javax.swing.text.Document;
 import javax.swing.text.JTextComponent;
-import org.netbeans.api.editor.mimelookup.MimeRegistration;
 import org.netbeans.spi.editor.codegen.CodeGenerator;
 import org.netbeans.spi.editor.codegen.CodeGeneratorContextProvider;
 import org.openide.util.Exceptions;

+ 2 - 6
jme3-core/src/com/jme3/gde/core/dnd/AssetTransferable.java

@@ -4,14 +4,10 @@
  */
 package com.jme3.gde.core.dnd;
 
-import com.jme3.gde.core.dnd.AssetNameHolder;
-import com.jme3.gde.core.dnd.StringDataFlavor;
-import com.jme3.gde.core.dnd.TextureDataFlavor;
 import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.Transferable;
 import java.awt.datatransfer.UnsupportedFlavorException;
 import java.io.IOException;
-import javax.swing.JPanel;
 
 /**
  *
@@ -20,8 +16,8 @@ import javax.swing.JPanel;
  */
 public class AssetTransferable<T extends DataFlavor> implements Transferable {
 
-    private DataFlavor[] flavors;
-    private AssetNameHolder string;
+    private final DataFlavor[] flavors;
+    private final AssetNameHolder string;
 
     public AssetTransferable(AssetNameHolder name, T flavor) {
         this.string = name;

+ 0 - 1
jme3-core/src/com/jme3/gde/core/dnd/MaterialDropTargetListener.java

@@ -9,7 +9,6 @@ import com.jme3.math.Vector2f;
 import java.awt.Cursor;
 import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.Transferable;
-import java.awt.dnd.DropTargetContext;
 import java.awt.dnd.DropTargetDragEvent;
 import java.awt.dnd.DropTargetDropEvent;
 import java.awt.dnd.DropTargetEvent;

+ 0 - 1
jme3-core/src/com/jme3/gde/core/editor/nodes/NodePanel.java

@@ -49,7 +49,6 @@ import javax.swing.GroupLayout;
 import javax.swing.GroupLayout.ParallelGroup;
 import javax.swing.GroupLayout.SequentialGroup;
 import javax.swing.Icon;
-import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JPanel;

+ 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);
     }
     
     /**

+ 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;

+ 0 - 1
jme3-core/src/com/jme3/gde/core/filters/impl/JmeFilter.java

@@ -34,7 +34,6 @@ package com.jme3.gde.core.filters.impl;
 import com.jme3.gde.core.filters.AbstractFilterNode;
 import com.jme3.gde.core.filters.FilterNode;
 import com.jme3.post.Filter;
-import com.jme3.shadow.AbstractShadowFilter;
 import java.lang.reflect.Method;
 import org.openide.loaders.DataObject;
 import org.openide.nodes.Node;

+ 0 - 1
jme3-core/src/com/jme3/gde/core/icons/IconList.java

@@ -31,7 +31,6 @@
  */
 package com.jme3.gde.core.icons;
 
-import javax.swing.Icon;
 import javax.swing.ImageIcon;
 import org.openide.util.ImageUtilities;
 

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

@@ -39,6 +39,7 @@ import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.StringWriter;
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URL;
 import java.util.Properties;
 import java.util.logging.Level;
@@ -234,7 +235,7 @@ public class ProjectExtensionManager {
 
     public void setDataZip(String url) {
         try {
-            this.zipFile = new URL(url);
+            this.zipFile = URI.create(url).toURL();
         } catch (MalformedURLException ex) {
             Exceptions.printStackTrace(ex);
         }
@@ -251,7 +252,7 @@ public class ProjectExtensionManager {
      */
     public void loadTargets(String path) {
         try {
-            LineNumberReader in = new LineNumberReader(new InputStreamReader(new URL(path).openStream()));
+            LineNumberReader in = new LineNumberReader(new InputStreamReader(URI.create(path).toURL().openStream()));
             StringWriter out = new StringWriter();
             String line = in.readLine();
             while (line != null) {
@@ -500,7 +501,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();

+ 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) {

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

@@ -40,7 +40,6 @@ import java.awt.Rectangle;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyEditor;
-import java.util.Iterator;
 import java.util.LinkedList;
 
 /**
@@ -49,16 +48,16 @@ import java.util.LinkedList;
  */
 public class ColorRGBAPropertyEditor implements PropertyEditor {
 
-    private LinkedList<PropertyChangeListener> listeners = new LinkedList<PropertyChangeListener>();
+    private final LinkedList<PropertyChangeListener> listeners = new LinkedList<>();
     private ColorRGBA color = new ColorRGBA();
 
     @Override
     public void setValue(Object value) {
-        if (value instanceof ColorRGBA) {
+        if (value instanceof ColorRGBA colorRGBA) {
             if (color == null) {
-                color = new ColorRGBA((ColorRGBA) value);
+                color = new ColorRGBA(colorRGBA);
             } else {
-                color.set((ColorRGBA) value);
+                color.set(colorRGBA);
             }
         }
     }

+ 26 - 20
jme3-core/src/com/jme3/gde/core/properties/EmitterShapePropertyEditor.java

@@ -128,28 +128,34 @@ public class EmitterShapePropertyEditor implements PropertyEditor {
         if (strings.length == 0) {
             return;
         }
-        if ("box".equals(strings[0].trim().toLowerCase())) {
-            if (strings.length == 7) {
-                StatusDisplayer.getDefault().setStatusText("try set parameterized box shape");
-                emitter = new EmitterBoxShape(
-                        new Vector3f(Float.parseFloat(strings[1]), Float.parseFloat(strings[2]), Float.parseFloat(strings[3])), new Vector3f(Float.parseFloat(strings[4]), Float.parseFloat(strings[5]), Float.parseFloat(strings[6])));
-            } else {
-                StatusDisplayer.getDefault().setStatusText("try set standard box shape");
-                emitter = new EmitterBoxShape(new Vector3f(-.5f, -.5f, -.5f), new Vector3f(.5f, .5f, .5f));
+        if (null != strings[0].trim().toLowerCase()) switch (strings[0].trim().toLowerCase()) {
+            case "box" -> {
+                if (strings.length == 7) {
+                    StatusDisplayer.getDefault().setStatusText("try set parameterized box shape");
+                    emitter = new EmitterBoxShape(
+                            new Vector3f(Float.parseFloat(strings[1]), Float.parseFloat(strings[2]), Float.parseFloat(strings[3])), new Vector3f(Float.parseFloat(strings[4]), Float.parseFloat(strings[5]), Float.parseFloat(strings[6])));
+                } else {
+                    StatusDisplayer.getDefault().setStatusText("try set standard box shape");
+                    emitter = new EmitterBoxShape(new Vector3f(-.5f, -.5f, -.5f), new Vector3f(.5f, .5f, .5f));
+                }
             }
-        } else if ("point".equals(strings[0].trim().toLowerCase())) {
-            if (strings.length == 4) {
-                emitter = new EmitterPointShape(
-                        new Vector3f(Float.parseFloat(strings[1]), Float.parseFloat(strings[2]), Float.parseFloat(strings[3])));
-            } else {
-                emitter = new EmitterPointShape(Vector3f.ZERO);
+            case "point" -> {
+                if (strings.length == 4) {
+                    emitter = new EmitterPointShape(
+                            new Vector3f(Float.parseFloat(strings[1]), Float.parseFloat(strings[2]), Float.parseFloat(strings[3])));
+                } else {
+                    emitter = new EmitterPointShape(Vector3f.ZERO);
+                }
             }
-        } else if ("sphere".equals(strings[0].trim().toLowerCase())) {
-            if (strings.length == 5) {
-                emitter = new EmitterSphereShape(
-                        new Vector3f(Float.parseFloat(strings[1]), Float.parseFloat(strings[2]), Float.parseFloat(strings[3])), Float.parseFloat(strings[4]));
-            } else {
-                emitter = new EmitterSphereShape(Vector3f.ZERO, .5f);
+            case "sphere" -> {
+                if (strings.length == 5) {
+                    emitter = new EmitterSphereShape(
+                            new Vector3f(Float.parseFloat(strings[1]), Float.parseFloat(strings[2]), Float.parseFloat(strings[3])), Float.parseFloat(strings[4]));
+                } else {
+                    emitter = new EmitterSphereShape(Vector3f.ZERO, .5f);
+                }
+            }
+            default -> {
             }
         }
         notifyListeners(old, emitter);

+ 3 - 9
jme3-core/src/com/jme3/gde/core/properties/LightPropertyEditor.java

@@ -45,8 +45,6 @@ import java.beans.PropertyEditor;
 import java.util.LinkedList;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.locks.ReentrantLock;
 import org.netbeans.api.project.Project;
 import org.openide.DialogDisplayer;
 import org.openide.NotifyDescriptor;
@@ -61,24 +59,20 @@ import org.openide.util.Exceptions;
 
 
 public class LightPropertyEditor implements PropertyEditor {
-    private final LinkedList<PropertyChangeListener> listeners = new LinkedList<PropertyChangeListener>();
-    private JmeLight jmeLight;
+    private final LinkedList<PropertyChangeListener> listeners = new LinkedList<>();
     private Light li;
-    private Project proj;
 
     public LightPropertyEditor() {
     }
 
     public LightPropertyEditor(JmeLight jmeLight, Project project) {
-        this.jmeLight = jmeLight;
         this.li = jmeLight.getLookup().lookup(Light.class);
-        this.proj = project;
     }
 
     @Override
     public void setValue(Object value) {
-        if (value instanceof Light) {
-            li = (Light) value;
+        if (value instanceof Light light) {
+            li = light;
         }
     }
 

+ 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);

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

@@ -44,8 +44,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import javax.swing.JFrame;
 import org.openide.nodes.PropertySupport;
 import org.openide.util.Exceptions;
@@ -56,11 +54,11 @@ import org.openide.util.Exceptions;
  */
 public class UserDataProperty extends PropertySupport.ReadWrite<String> {
 
-    private Spatial spatial;
-    private JmeSpatial node;
+    private final Spatial spatial;
+    private final JmeSpatial node;
     private String name = "null";
     private int type = 0;
-    private List<ScenePropertyChangeListener> listeners = new LinkedList<ScenePropertyChangeListener>();
+    private final List<ScenePropertyChangeListener> listeners = new LinkedList<>();
 
     public UserDataProperty(JmeSpatial node, String name) {
         super(name, String.class, name, "");
@@ -103,19 +101,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();

+ 18 - 13
jme3-core/src/com/jme3/gde/core/properties/preview/TexturePreview.java

@@ -96,19 +96,24 @@ public class TexturePreview implements SceneListener {
                 TextureKey key = new TextureKey(textureName);
                 Texture t = assetManager.loadTexture(key);
                 Spatial geom = quad;
-                if (key.getTextureTypeHint() == Texture.Type.TwoDimensional) {
-                    material.setTexture("ColorMap", t);
-                    geom.setMaterial(material);                    
-                    setLabel(infoLabel, displayName, t.getImage().getWidth(),  t.getImage().getHeight(), -1);                    
-                } else if (key.getTextureTypeHint() == Texture.Type.ThreeDimensional) {
-                    geom = quad3D;
-                    material3D.setTexture("Texture", t);
-                    geom.setMaterial(material3D);
-                    setLabel(infoLabel, displayName + " (Texture3D)", t.getImage().getWidth(),  t.getImage().getHeight(),  t.getImage().getDepth());
-                    
-                } else if (key.getTextureTypeHint() == Texture.Type.CubeMap) {
-                    geom = SkyFactory.createSky(assetManager, textureName, SkyFactory.EnvMapType.CubeMap);
-                    setLabel(infoLabel, displayName + " (CubeMap)", t.getImage().getWidth(),  t.getImage().getHeight(),  -1);                        
+                if (null != key.getTextureTypeHint()) switch (key.getTextureTypeHint()) {
+                    case TwoDimensional -> {
+                        material.setTexture("ColorMap", t);
+                        geom.setMaterial(material);
+                        setLabel(infoLabel, displayName, t.getImage().getWidth(),  t.getImage().getHeight(), -1);
+                    }
+                    case ThreeDimensional -> {
+                        geom = quad3D;
+                        material3D.setTexture("Texture", t);
+                        geom.setMaterial(material3D);
+                        setLabel(infoLabel, displayName + " (Texture3D)", t.getImage().getWidth(),  t.getImage().getHeight(),  t.getImage().getDepth());
+                    }
+                    case CubeMap -> {                        
+                        geom = SkyFactory.createSky(assetManager, textureName, SkyFactory.EnvMapType.CubeMap);
+                        setLabel(infoLabel, displayName + " (CubeMap)", t.getImage().getWidth(),  t.getImage().getHeight(),  -1);
+                    }
+                    default -> {
+                    }
                 }
 
                 PreviewRequest request = new PreviewRequest(TexturePreview.this, geom, width, height);

+ 2 - 2
jme3-core/src/com/jme3/gde/core/scene/SceneApplication.java

@@ -67,7 +67,7 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.IOException;
 import java.net.MalformedURLException;
-import java.net.URL;
+import java.net.URI;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.logging.Level;
@@ -735,7 +735,7 @@ public class SceneApplication extends LegacyApplication implements LookupProvide
         @Override
         public void actionPerformed(ActionEvent e) {
             try {
-                HtmlBrowser.URLDisplayer.getDefault().showURL(new URL("https://wiki.jmonkeyengine.org/sdk/troubleshooting.html"));
+                HtmlBrowser.URLDisplayer.getDefault().showURL(URI.create("https://wiki.jmonkeyengine.org/sdk/troubleshooting.html").toURL());
             } catch (MalformedURLException ex) {
                 Exceptions.printStackTrace(ex);
             }

+ 36 - 43
jme3-core/src/com/jme3/gde/core/scene/controller/AbstractCameraController.java

@@ -319,54 +319,47 @@ public abstract class AbstractCameraController extends AbstractAppState implemen
     public abstract boolean useCameraControls();
 
     public void onAnalog(String string, float f1, float f) {
-        if ("MouseAxisX".equals(string)) {
-            moved = true;
-            movedR = true;
-
-            if ((buttonDownL && useCameraControls()) || (buttonDownM && !shiftModifier)) {
-                doRotateCamera(Vector3f.UNIT_Y, -f1 * 2.5f);
-            }
-            if ((buttonDownR && useCameraControls()) || (buttonDownM && shiftModifier)) {
-                doPanCamera(f1 * 2.5f, 0);
-            }
-
-        } else if ("MouseAxisY".equals(string)) {
-            moved = true;
-            movedR = true;
-
-            if ((buttonDownL && useCameraControls()) || (buttonDownM && !shiftModifier)) {
-                doRotateCamera(cam.getLeft(), -f1 * 2.5f);
-            }
-            if ((buttonDownR && useCameraControls()) || (buttonDownM && shiftModifier)) {
-                doPanCamera(0, -f1 * 2.5f);
+        if (null != string) switch (string) {
+            case "MouseAxisX" -> {
+                moved = true;
+                movedR = true;
+                if ((buttonDownL && useCameraControls()) || (buttonDownM && !shiftModifier)) {
+                    doRotateCamera(Vector3f.UNIT_Y, -f1 * 2.5f);
+                }   if ((buttonDownR && useCameraControls()) || (buttonDownM && shiftModifier)) {
+                    doPanCamera(f1 * 2.5f, 0);
+                }
             }
-
-        } else if ("MouseAxisX-".equals(string)) {
-            moved = true;
-            movedR = true;
-
-            if ((buttonDownL && useCameraControls()) || (buttonDownM && !shiftModifier)) {
-                doRotateCamera(Vector3f.UNIT_Y, f1 * 2.5f);
+            case "MouseAxisY" -> {
+                moved = true;
+                movedR = true;
+                if ((buttonDownL && useCameraControls()) || (buttonDownM && !shiftModifier)) {
+                    doRotateCamera(cam.getLeft(), -f1 * 2.5f);
+                }   if ((buttonDownR && useCameraControls()) || (buttonDownM && shiftModifier)) {
+                    doPanCamera(0, -f1 * 2.5f);
+                }
             }
-            if ((buttonDownR && useCameraControls()) || (buttonDownM && shiftModifier)) {
-                doPanCamera(-f1 * 2.5f, 0);
+            case "MouseAxisX-" -> {
+                moved = true;
+                movedR = true;
+                if ((buttonDownL && useCameraControls()) || (buttonDownM && !shiftModifier)) {
+                    doRotateCamera(Vector3f.UNIT_Y, f1 * 2.5f);
+                }   if ((buttonDownR && useCameraControls()) || (buttonDownM && shiftModifier)) {
+                    doPanCamera(-f1 * 2.5f, 0);
+                }
             }
-
-        } else if ("MouseAxisY-".equals(string)) {
-            moved = true;
-            movedR = true;
-
-            if ((buttonDownL && useCameraControls()) || (buttonDownM && !shiftModifier)) {
-                doRotateCamera(cam.getLeft(), f1 * 2.5f);
+            case "MouseAxisY-" -> {
+                moved = true;
+                movedR = true;
+                if ((buttonDownL && useCameraControls()) || (buttonDownM && !shiftModifier)) {
+                    doRotateCamera(cam.getLeft(), f1 * 2.5f);
+                }   if ((buttonDownR && useCameraControls()) || (buttonDownM && shiftModifier)) {
+                    doPanCamera(0, f1 * 2.5f);
+                }
             }
-            if ((buttonDownR && useCameraControls()) || (buttonDownM && shiftModifier)) {
-                doPanCamera(0, f1 * 2.5f);
+            case "MouseWheel" -> doZoomCamera(.1f);
+            case "MouseWheel-" -> doZoomCamera(-.1f);
+            default -> {
             }
-
-        } else if ("MouseWheel".equals(string)) {
-            doZoomCamera(.1f);
-        } else if ("MouseWheel-".equals(string)) {
-            doZoomCamera(-.1f);
         }
     }
 

+ 9 - 7
jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/AbstractSceneExplorerNode.java

@@ -289,13 +289,15 @@ public abstract class AbstractSceneExplorerNode extends AbstractNode implements
 
     @Override
     public void propertyChange(final String type, final String name, final Object before, final Object after) {
-        if (SceneExplorerProperty.PROP_USER_CHANGE.equals(type)) {
-            fireSave(true);
-            firePropertyChange(name, before, after);
-        } else if (SceneExplorerProperty.PROP_SCENE_CHANGE.equals(type)) {
-            firePropertyChange(name, before, after);
-        } else if (SceneExplorerProperty.PROP_INIT_CHANGE.equals(type)) {
-            firePropertyChange(name, before, after);
+        if (null != type) switch (type) {
+            case SceneExplorerProperty.PROP_USER_CHANGE -> {
+                fireSave(true);
+                firePropertyChange(name, before, after);
+            }
+            case SceneExplorerProperty.PROP_SCENE_CHANGE -> firePropertyChange(name, before, after);
+            case SceneExplorerProperty.PROP_INIT_CHANGE -> firePropertyChange(name, before, after);
+            default -> {
+            }
         }
     }
 

+ 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");

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

@@ -33,7 +33,6 @@ package com.jme3.gde.core.sceneexplorer.nodes;
 
 import com.jme3.effect.ParticleEmitter;
 import com.jme3.font.BitmapText;
-import com.jme3.gde.core.scene.SceneApplication;
 import com.jme3.light.AmbientLight;
 import com.jme3.light.DirectionalLight;
 import com.jme3.light.Light;
@@ -68,7 +67,7 @@ public class JmeSpatialChildren extends Children.Keys<Object> {
 
     protected Spatial spatial;
     protected boolean readOnly = true;
-    protected HashMap<Object, Node> map = new HashMap<Object, Node>();
+    protected HashMap<Object, Node> map = new HashMap<>();
     private DataObject dataObject;
     boolean hasKeys; // We use this to cache the keys, unless refresh is called
 

+ 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 - 3
jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeTerrainQuad.java

@@ -34,10 +34,7 @@ package com.jme3.gde.core.sceneexplorer.nodes;
 import com.jme3.gde.core.icons.IconList;
 import com.jme3.terrain.geomipmap.TerrainQuad;
 import java.awt.Image;
-import java.io.IOException;
-import org.openide.cookies.SaveCookie;
 import org.openide.loaders.DataObject;
-import org.openide.nodes.Node;
 import org.openide.nodes.Sheet;
 
 /**

+ 5 - 12
jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeTrack.java

@@ -86,18 +86,11 @@ public class JmeTrack extends AbstractSceneExplorerNode {
     }
 
     private void setName() {
-        if (track instanceof BoneTrack) {
-            BoneTrack boneTrack = (BoneTrack) track;
-            super.setName("BoneTrack : " + control.getSkeleton().getBone(boneTrack.getTargetBoneIndex()).getName());
-        } else if (track instanceof EffectTrack) {
-            EffectTrack effectTrack = (EffectTrack) track;
-            super.setName("EffectTrack : " + effectTrack.getEmitter().getName());            
-        } else if (track instanceof AudioTrack) {
-            AudioTrack audioTrack = (AudioTrack) track;
-            super.setName("AudioTrack : " + audioTrack.getAudio().getName());
-            
-        } else {
-            super.setName(track.getClass().getSimpleName());
+        switch (track) {
+            case BoneTrack boneTrack -> super.setName("BoneTrack : " + control.getSkeleton().getBone(boneTrack.getTargetBoneIndex()).getName());
+            case EffectTrack effectTrack -> super.setName("EffectTrack : " + effectTrack.getEmitter().getName());
+            case AudioTrack audioTrack -> super.setName("AudioTrack : " + audioTrack.getAudio().getName());
+            default -> super.setName(track.getClass().getSimpleName());
         }
     }
     

+ 0 - 3
jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/ExtractSubAnimationDialog.java

@@ -38,7 +38,6 @@ import com.jme3.animation.Track;
 import com.jme3.gde.core.scene.SceneApplication;
 import com.jme3.gde.core.sceneexplorer.nodes.animation.JmeAnimControl;
 import com.jme3.math.Quaternion;
-import com.jme3.math.Transform;
 import com.jme3.math.Vector3f;
 import java.awt.Cursor;
 import java.io.BufferedReader;
@@ -62,7 +61,6 @@ public class ExtractSubAnimationDialog extends javax.swing.JDialog {
 
     Animation _animation;
     JmeAnimControl _animControl;
-    private int _splitAnimationCount;
 
     /**
      * Creates new form ChannelDialog
@@ -77,7 +75,6 @@ public class ExtractSubAnimationDialog extends javax.swing.JDialog {
         _radManual.setSelected(true);
         _txtCsvFilename.setEnabled(false);
         _btnBrowse.setEnabled(false);
-        _splitAnimationCount = 0;
     }
 
     public void setAnimation(Animation animation) {

+ 2 - 3
jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/ParticleInfluencerPicker.java

@@ -40,7 +40,7 @@ import com.jme3.gde.core.assets.ProjectAssetManager;
 import com.jme3.gde.core.properties.ParticleInfluencerPropertyEditor;
 import com.jme3.gde.core.sceneexplorer.nodes.JmeParticleEmitter;
 import java.awt.EventQueue;
-import java.util.HashSet;
+import java.util.EnumSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
@@ -126,8 +126,7 @@ public class ParticleInfluencerPicker extends javax.swing.JDialog {
                             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();) {

+ 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);
                     }

+ 2 - 3
jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/UserDataPicker.java

@@ -39,7 +39,7 @@ package com.jme3.gde.core.sceneexplorer.nodes.actions;
 import com.jme3.gde.core.assets.ProjectAssetManager;
 import com.jme3.gde.core.sceneexplorer.nodes.JmeSpatial;
 import java.awt.EventQueue;
-import java.util.HashSet;
+import java.util.EnumSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
@@ -114,8 +114,7 @@ public class UserDataPicker extends javax.swing.JDialog {
                             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();) {

+ 0 - 2
jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/animation/AnimClipProperty.java

@@ -34,9 +34,7 @@ package com.jme3.gde.core.sceneexplorer.nodes.actions.animation;
 import com.jme3.anim.AnimClip;
 import com.jme3.anim.AnimComposer;
 import com.jme3.gde.core.scene.SceneApplication;
-import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
-import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import org.openide.nodes.PropertySupport;
 import org.openide.util.Exceptions;

+ 1 - 1
jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/NewCustomControlVisualPanel1.form

@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 
 <Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
   <AuxValues>

+ 2 - 3
jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/NewCustomControlVisualPanel1.java

@@ -31,7 +31,7 @@
  */
 package com.jme3.gde.core.sceneexplorer.nodes.actions.impl;
 
-import java.util.HashSet;
+import java.util.EnumSet;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -94,8 +94,7 @@ public final class NewCustomControlVisualPanel1 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();

+ 2 - 1
jme3-core/src/com/jme3/gde/core/util/ZipExtensionTool.java

@@ -41,6 +41,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
+import java.net.URI;
 import java.net.URL;
 import java.util.Properties;
 import java.util.concurrent.ConcurrentHashMap;
@@ -177,7 +178,7 @@ public class ZipExtensionTool {
         URL url = null;
         try {
             String tempFileName = extractionPath + "_tmp.zip";
-            url = new URL("nbres:" + zipPath);
+            url = URI.create("nbres:" + zipPath).toURL();
             in = new BufferedInputStream(url.openStream());
             out = new BufferedOutputStream(new FileOutputStream(tempFileName));
             int inbyte = in.read();

+ 0 - 1
jme3-dark-laf/src/org/jme3/netbeans/plaf/darkmonkey/DMUtils.java

@@ -15,7 +15,6 @@ import java.awt.image.DataBuffer;
 import java.awt.image.DataBufferFloat;
 import java.awt.image.Raster;
 import java.awt.image.WritableRaster;
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import javax.imageio.ImageIO;

+ 0 - 5
jme3-dark-laf/src/org/jme3/netbeans/plaf/darkmonkey/DarkMonkeyIconFactory.java

@@ -10,12 +10,7 @@ import java.awt.Color;
 import java.awt.Component;
 import java.awt.Graphics;
 import java.awt.Image;
-import java.awt.image.BandedSampleModel;
 import java.awt.image.BufferedImage;
-import java.awt.image.DataBuffer;
-import java.awt.image.DataBufferFloat;
-import java.awt.image.Raster;
-import java.awt.image.WritableRaster;
 import java.io.Serializable;
 import javax.swing.Icon;
 import javax.swing.ImageIcon;

+ 0 - 4
jme3-dark-laf/src/org/jme3/netbeans/plaf/darkmonkey/DarkMonkeyValidator.java

@@ -5,11 +5,7 @@
  */
 package org.jme3.netbeans.plaf.darkmonkey;
 
-import java.awt.EventQueue;
-import javax.swing.JOptionPane;
-import javax.swing.UIManager;
 import org.openide.modules.OnStart;
-import org.openide.windows.OnShowing;
 
 /**
  * This is something that would be used once the nbm format is no longer

+ 10 - 11
jme3-desktop-executables/src/com/jme3/gde/desktop/executables/JreDownloader.java

@@ -39,7 +39,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
-import java.net.URL;
+import java.net.URI;
 import java.util.concurrent.Callable;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -91,21 +91,20 @@ public class JreDownloader {
     private static void attemptDownload(String newUrl, File dest, int retry) {
         logger.log(Level.INFO, "Attempt to download JRE from {0}", newUrl);
         try {
-            HttpURLConnection connection = (HttpURLConnection) new URL(newUrl).openConnection();
+            HttpURLConnection connection = (HttpURLConnection) URI.create(newUrl).toURL().openConnection();
             connection.setRequestProperty("Cookie", "gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie");
             connection.setAllowUserInteraction(false);
             connection.setInstanceFollowRedirects(true);
             connection.connect();
             int status = connection.getResponseCode();
-            if (status == HttpURLConnection.HTTP_OK) {
-                downloadFile(connection, dest, retry);
-            } else if (status == HttpURLConnection.HTTP_MOVED_TEMP || status == HttpURLConnection.HTTP_MOVED_PERM || status == HttpURLConnection.HTTP_SEE_OTHER) {
-                handleRedirect(connection, dest, retry);
-            } else if (status == HttpURLConnection.HTTP_NOT_FOUND) {
-                MessageUtil.error("Download of JRE failed because it was not found.\nMaybe you are running an old Version which isn't available for download anymore?");
-                MessageUtil.error("Go to download.oracle.com and alter the version field in the Project Properties accordingly.\nIf the Problem persists, download the .tar.gz files manually to\n" + dest.getAbsolutePath());
-            } else {
-                logger.log(Level.WARNING, "Download of JRE from {0} failed. HTTP Status Code {1} ", new Object[]{newUrl, status});
+            switch (status) {
+                case HttpURLConnection.HTTP_OK -> downloadFile(connection, dest, retry);
+                case HttpURLConnection.HTTP_MOVED_TEMP, HttpURLConnection.HTTP_MOVED_PERM, HttpURLConnection.HTTP_SEE_OTHER -> handleRedirect(connection, dest, retry);
+                case HttpURLConnection.HTTP_NOT_FOUND -> {
+                    MessageUtil.error("Download of JRE failed because it was not found.\nMaybe you are running an old Version which isn't available for download anymore?");
+                    MessageUtil.error("Go to download.oracle.com and alter the version field in the Project Properties accordingly.\nIf the Problem persists, download the .tar.gz files manually to\n" + dest.getAbsolutePath());
+                }
+                default -> logger.log(Level.WARNING, "Download of JRE from {0} failed. HTTP Status Code {1} ", new Object[]{newUrl, status});
             }
         } catch (MalformedURLException ex) {
             logger.log(Level.SEVERE, "{0}", ex);

+ 47 - 52
jme3-glsl-highlighter/src/com/jme3/gde/glsl/highlighter/lexer/GlslLexer.java

@@ -31,7 +31,6 @@
  */
 package com.jme3.gde.glsl.highlighter.lexer;
 
-import java.util.logging.Logger;
 import org.netbeans.api.lexer.Token;
 import org.netbeans.spi.lexer.Lexer;
 import org.netbeans.spi.lexer.LexerInput;
@@ -47,7 +46,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 = "";
 
@@ -74,34 +72,37 @@ public class GlslLexer implements Lexer<GlslTokenID> {
             }
         }
         switch (c) {
-            case '/':
+            case '/' -> {
                 int next = lexerInput.read();
-                if (next == '/') {
-                    //It's an inline comment
-                    readTillNewLine();
-                    return token(GlslTokenID.INLINE_COMMENT);
-                } else if (next == '*') {
-                    while (true) {
-                        int c1 = lexerInput.read();
-                        if (c1 == '*') {
-                            if (lexerInput.read() == '/') {
+                switch (next) {
+                    case '/' -> {
+                        //It's an inline comment
+                        readTillNewLine();
+                        return token(GlslTokenID.INLINE_COMMENT);
+                    }
+                    case '*' -> {
+                        while (true) {
+                            int c1 = lexerInput.read();
+                            if (c1 == '*') {
+                                if (lexerInput.read() == '/') {
+                                    return token(GlslTokenID.BLOCK_COMMENT);
+                                } else {
+                                    lexerInput.backup(1);
+                                }
+                            } else if (c1 == LexerInput.EOF) {
                                 return token(GlslTokenID.BLOCK_COMMENT);
-                            } else {
-                                lexerInput.backup(1);
                             }
-                        } else if (c1 == LexerInput.EOF) {
-                            return token(GlslTokenID.BLOCK_COMMENT);
                         }
                     }
-                } else {
-                    lexerInput.backup(1);
+                    default -> lexerInput.backup(1);
                 }
                 return token(GlslTokenID.OPERATOR);
-            case '\"':
-            case '\'':
-                //String starts here
+            }
+
+
+            case '\"', '\'' -> {
                 int previous = c,
-                 starter = c;
+                        starter = c;
                 while (true) {
                     int now = lexerInput.read();
 
@@ -111,51 +112,44 @@ public class GlslLexer implements Lexer<GlslTokenID> {
                     previous = now;
                 }
                 return token(GlslTokenID.STRING);
-            case '#':
+            }
+            case '#' -> {
                 if (thisLineSoFar.trim().equals("#")) {
                     //Preprocessor code
                     readTillNewLine();
                     return token(GlslTokenID.PREPROCESSOR);
                 }
                 return token(GlslTokenID.OPERATOR);
-            case '|':
-            case '&':
-            case '.':
-            case '>':
-            case '<':
-            case ',':
-            case ';':
-            case ':':
-            case '=':
-            case '+':
-            case '-':
-            case '*':
-            case '%':
-            case '!':
-            case '~':
-            case '^':
-            case '\\':
+            }
+            case '|', '&', '.', '>', '<', ',', ';', ':', '=', '+', '-', '*', '%', '!', '~', '^', '\\' -> {
                 return token(GlslTokenID.OPERATOR);
-            //Those have to be recognized separately for closing bracket recognition
-            case '(':
+            }
+            case '(' -> {
                 return token(GlslTokenID.LPARENTHESIS);
-            case ')':
+            }
+            case ')' -> {
                 return token(GlslTokenID.RPARENTHESIS);
-            case '{':
+            }
+            case '{' -> {
                 return token(GlslTokenID.LBRACKET);
-            case '}':
+            }
+            case '}' -> {
                 return token(GlslTokenID.RBRACKET);
-            case '[':
+            }
+            case '[' -> {
                 return token(GlslTokenID.LSQUARE);
-            case ']':
+            }
+            case ']' -> {
                 return token(GlslTokenID.RSQUARE);
-            case '\n':
-            case '\r':
+            }
+            case '\n', '\r' -> {
                 thisLineSoFar = "";
                 return token(GlslTokenID.NEW_LINE);
-            case LexerInput.EOF:
+            }
+            case LexerInput.EOF -> {
                 return null;
-            default:
+            }
+            default -> {
                 //Text, gotta look it up the library
                 String word = "" + (char) c;
                 if (GlslKeywordLibrary.lookup(word) != null) {
@@ -197,7 +191,6 @@ public class GlslLexer implements Lexer<GlslTokenID> {
                         }
                     }
                     if (current == null) {
-                        break;
                     }
                     switch (current) {
                         case BASIC_TYPE:
@@ -210,7 +203,9 @@ public class GlslLexer implements Lexer<GlslTokenID> {
                             return token(GlslTokenID.BUILTIN_FUNCTION);
                     }
                 }
+            }
         }
+        //Those have to be recognized separately for closing bracket recognition
         return token(GlslTokenID.TEXT);
     }
 

+ 0 - 2
jme3-gui/src/com/jme3/gde/gui/palette/NiftyGUIPaletteFactory.java

@@ -10,7 +10,6 @@
 package com.jme3.gde.gui.palette;
 
 import jada.ngeditor.guiviews.DND.WidgetData;
-import java.io.IOException;
 import javax.swing.Action;
 import org.netbeans.api.editor.mimelookup.MimeRegistration;
 import org.netbeans.spi.palette.DragAndDropHandler;
@@ -19,7 +18,6 @@ import org.netbeans.spi.palette.PaletteController;
 import org.netbeans.spi.palette.PaletteFactory;
 import org.openide.nodes.AbstractNode;
 import org.openide.nodes.Children;
-import org.openide.util.Exceptions;
 import org.openide.util.Lookup;
 import org.openide.util.datatransfer.ExTransferable;
 

+ 0 - 2
jme3-gui/src/com/jme3/gde/gui/palette/WidgetChildFactory.java

@@ -4,8 +4,6 @@
  */
 package com.jme3.gde.gui.palette;
 
-import jada.ngeditor.guiviews.palettecomponents.NWidget;
-import jada.ngeditor.model.elements.GControl;
 import jada.ngeditor.model.elements.GElement;
 import jada.ngeditor.model.utils.ClassUtils;
 import java.lang.reflect.Modifier;

+ 0 - 10
jme3-gui/src/com/jme3/gde/gui/palette/WidgetNode.java

@@ -4,25 +4,15 @@
  */
 package com.jme3.gde.gui.palette;
 
-import jada.ngeditor.guiviews.DND.DragHandler;
-import jada.ngeditor.guiviews.DND.TrasferHandling;
 import jada.ngeditor.guiviews.DND.WidgetData;
-import jada.ngeditor.guiviews.palettecomponents.NWidget;
 import jada.ngeditor.model.GUIFactory;
 import jada.ngeditor.model.elements.GElement;
 import jada.ngeditor.model.exception.NoProductException;
 import java.awt.Image;
 import java.awt.datatransfer.Transferable;
-import java.awt.image.BufferedImage;
 import java.io.IOException;
-import java.io.InputStream;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.imageio.ImageIO;
-import javax.swing.ImageIcon;
 import org.openide.nodes.AbstractNode;
 import org.openide.nodes.Children;
-import org.openide.util.Exceptions;
 
 /**
  *

+ 0 - 2
jme3-gui/src/com/jme3/gde/gui/propertyeditors/ResourceEditor.java

@@ -10,8 +10,6 @@ import jada.ngeditor.model.GuiEditorModel;
 import java.awt.Component;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
 import java.beans.PropertyEditorSupport;
 import java.io.File;
 import java.util.Observable;

+ 0 - 5
jme3-gui/src/com/jme3/gde/gui/propertyeditors/SizeEditor.java

@@ -8,9 +8,6 @@ import java.awt.Component;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyEditorSupport;
-import java.beans.PropertyVetoException;
-import java.beans.VetoableChangeListener;
-import javax.swing.JLabel;
 import org.openide.explorer.propertysheet.ExPropertyEditor;
 import org.openide.explorer.propertysheet.PropertyEnv;
 
@@ -19,7 +16,6 @@ import org.openide.explorer.propertysheet.PropertyEnv;
  * @author cris
  */
 public class SizeEditor  extends PropertyEditorSupport implements ExPropertyEditor, PropertyChangeListener{
-    private PropertyEnv env;
 
     @Override
     public void setAsText(String text) throws IllegalArgumentException {
@@ -46,7 +42,6 @@ public class SizeEditor  extends PropertyEditorSupport implements ExPropertyEdit
 
     @Override
     public void attachEnv(PropertyEnv env) {
-        this.env = env;
     }
 
     @Override

+ 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");

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

@@ -7,7 +7,6 @@ package com.jme3.gde.gui.view;
 import com.jme3.gde.gui.nodes.GElementNode;
 import com.jme3.gde.gui.nodes.GUINode;
 import jada.ngeditor.controller.CommandProcessor;
-import jada.ngeditor.controller.GUIEditor;
 import jada.ngeditor.controller.commands.SelectCommand;
 import jada.ngeditor.listeners.events.SelectionChanged;
 import jada.ngeditor.model.GUI;

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

@@ -156,20 +156,16 @@ public final class NiftyGuiVisualElement extends JPanel implements MultiViewElem
             @Override
             public void itemStateChanged(ItemEvent e) {
                 String string = (String) e.getItem();
-                if ("640x480".equals(string)) {
-                    view.setResoltion(640, 480);
-                } else if ("1024x768".equals(string)) {
-                     view.setResoltion(1024, 768);
-                } else if ("1280x720".equals(string)) {
-                     view.setResoltion(1280, 720);
-                } else if ("800x600".equals(string)) {
-                     view.setResoltion(800, 600);
-                } else if ("800x480".equals(string)) {
-                     view.setResoltion(800, 480);
-                } else if ("480x800".equals(string)) {
-                     view.setResoltion(480, 800);
-                } else {
-                     view.setResoltion(800, 600);
+                if (null == string) {
+                    view.setResoltion(800, 600);
+                } else switch (string) {
+                    case "640x480" -> view.setResoltion(640, 480);
+                    case "1024x768" -> view.setResoltion(1024, 768);
+                    case "1280x720" -> view.setResoltion(1280, 720);
+                    case "800x600" -> view.setResoltion(800, 600);
+                    case "800x480" -> view.setResoltion(800, 480);
+                    case "480x800" -> view.setResoltion(480, 800);
+                    default -> view.setResoltion(800, 600);
                 }
             }
         });
@@ -349,7 +345,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());
             

+ 0 - 6
jme3-materialeditor/src/com/jme3/gde/materialdefinition/EditableMatDefFile.java

@@ -35,13 +35,9 @@ import com.jme3.gde.core.assets.ProjectAssetManager;
 import com.jme3.gde.core.errorreport.ExceptionUtils;
 import com.jme3.gde.core.scene.SceneApplication;
 import com.jme3.gde.materialdefinition.fileStructure.MatDefBlock;
-import com.jme3.gde.materialdefinition.fileStructure.ShaderNodeBlock;
 import com.jme3.gde.materialdefinition.fileStructure.TechniqueBlock;
 import com.jme3.gde.materialdefinition.fileStructure.UberStatement;
-import com.jme3.gde.materialdefinition.fileStructure.leaves.InputMappingBlock;
 import com.jme3.gde.materialdefinition.fileStructure.leaves.LeafStatement;
-import com.jme3.gde.materialdefinition.fileStructure.leaves.MatParamBlock;
-import com.jme3.gde.materialdefinition.fileStructure.leaves.OutputMappingBlock;
 import com.jme3.gde.materialdefinition.navigator.node.MatDefNode;
 import com.jme3.material.Material;
 import com.jme3.material.MaterialDef;
@@ -54,8 +50,6 @@ import com.jme3.shader.Shader;
 import com.jme3.shader.ShaderGenerator;
 import com.jme3.util.blockparser.BlockLanguageParser;
 import com.jme3.util.blockparser.Statement;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;

+ 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);

+ 13 - 15
jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/MatDefEditorlElement.java

@@ -58,10 +58,7 @@ import com.jme3.material.Material;
 import com.jme3.shader.Shader;
 import com.jme3.shader.ShaderNodeDefinition;
 import com.jme3.shader.ShaderNodeVariable;
-import com.jme3.shader.ShaderUtils;
-import java.awt.Color;
 import java.awt.Dimension;
-import java.awt.Font;
 import java.awt.Point;
 import java.beans.PropertyVetoException;
 import java.io.BufferedReader;
@@ -76,7 +73,6 @@ import java.util.List;
 import java.util.Map;
 import javax.swing.Action;
 import javax.swing.JComponent;
-import javax.swing.JLabel;
 import javax.swing.JPanel;
 import org.netbeans.core.spi.multiview.CloseOperationState;
 import org.netbeans.core.spi.multiview.MultiViewElement;
@@ -609,17 +605,19 @@ public final class MatDefEditorlElement extends JPanel implements
 
     private ConnectionEndpoint findConnectPoint(String nameSpace, String name, boolean isInput) {
 
-        if (nameSpace.equals("MatParam")
-                || nameSpace.equals("WorldParam")
-                || nameSpace.equals("Attr")) {
-            NodePanel np = diagram1.getNodePanel(nameSpace + "." + name);
-            return isInput ? np.getInputConnectPoint(name) : np.getOutputConnectPoint(name);
-        } else if (nameSpace.equals("Global")) {
-            ShaderOutBusPanel outBus = diagram1.getOutBusPanel(name);
-            return outBus.getConnectPoint();
-        } else {
-            NodePanel np = diagram1.getNodePanel(diagram1.getCurrentTechniqueName() + "/" + nameSpace);
-            return isInput ? np.getInputConnectPoint(name) : np.getOutputConnectPoint(name);
+        switch (nameSpace) {
+            case "MatParam", "WorldParam", "Attr" -> {
+                NodePanel np = diagram1.getNodePanel(nameSpace + "." + name);
+                return isInput ? np.getInputConnectPoint(name) : np.getOutputConnectPoint(name);
+            }
+            case "Global" -> {
+                ShaderOutBusPanel outBus = diagram1.getOutBusPanel(name);
+                return outBus.getConnectPoint();
+            }
+            default -> {
+                NodePanel np = diagram1.getNodePanel(diagram1.getCurrentTechniqueName() + "/" + nameSpace);
+                return isInput ? np.getInputConnectPoint(name) : np.getOutputConnectPoint(name);
+            }
         }
     }
 

+ 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/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;

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

@@ -6,7 +6,6 @@ package com.jme3.gde.materialdefinition.fileStructure;
 
 import com.jme3.gde.materialdefinition.fileStructure.leaves.MatParamBlock;
 import com.jme3.util.blockparser.Statement;
-import java.util.ArrayList;
 import java.util.List;
 
 /**

+ 38 - 35
jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/ShaderNodeBlock.java

@@ -195,45 +195,48 @@ public class ShaderNodeBlock extends UberStatement implements PropertyChangeList
     }
 
     public void propertyChange(PropertyChangeEvent evt) {
-        if (evt.getPropertyName().equals(POSITION)) {
-            spatialOrder = (Integer) evt.getNewValue();
-            fire("order", null, null);
-        } else if (evt.getPropertyName().equals(INPUT)) {
-            InputMappingBlock mapping = (InputMappingBlock) evt.getNewValue();
-            if (mapping != null) {
-                if (mapping.getRightNameSpace().equals("Global")) {
-                    globalInput = true;
-                } else {
-                    inputNodes.add(mapping.getRightNameSpace());
-                }
-                addInputMapping(mapping);
-            } else {
-                InputMappingBlock oldMapping = (InputMappingBlock) evt.getOldValue();
-                if (oldMapping.getRightNameSpace().equals("Global")) {
-                    globalInput = false;
-                } else {
-                    inputNodes.remove(oldMapping.getRightNameSpace());
-                }
-                removeInputMapping(oldMapping);
+        switch (evt.getPropertyName()) {
+            case POSITION -> {
+                spatialOrder = (Integer) evt.getNewValue();
+                fire("order", null, null);
             }
-            fire("order", null, null);
-
-        } else if (evt.getPropertyName().equals(OUTPUT)) {
-            OutputMappingBlock mapping = (OutputMappingBlock) evt.getNewValue();
-            if (mapping != null) {
-                if (mapping.getLeftNameSpace().equals("Global")) {
-                    globalOutput = true;
+            case INPUT ->                 {
+                    InputMappingBlock mapping = (InputMappingBlock) evt.getNewValue();
+                    if (mapping != null) {
+                        if (mapping.getRightNameSpace().equals("Global")) {
+                            globalInput = true;
+                        } else {
+                            inputNodes.add(mapping.getRightNameSpace());
+                        }
+                        addInputMapping(mapping);
+                    } else {
+                        InputMappingBlock oldMapping = (InputMappingBlock) evt.getOldValue();
+                        if (oldMapping.getRightNameSpace().equals("Global")) {
+                            globalInput = false;
+                        } else {
+                            inputNodes.remove(oldMapping.getRightNameSpace());
+                        }
+                        removeInputMapping(oldMapping);
+                    }       fire("order", null, null);
                 }
-                addOutputMapping(mapping);
-            } else {
-                OutputMappingBlock oldMapping = (OutputMappingBlock) evt.getOldValue();
-
-                if (oldMapping.getLeftNameSpace().equals("Global")) {
-                    globalOutput = false;
+            case OUTPUT ->                 {
+                    OutputMappingBlock mapping = (OutputMappingBlock) evt.getNewValue();
+                    if (mapping != null) {
+                        if (mapping.getLeftNameSpace().equals("Global")) {
+                            globalOutput = true;
+                        }
+                        addOutputMapping(mapping);
+                    } else {
+                        OutputMappingBlock oldMapping = (OutputMappingBlock) evt.getOldValue();
+                        
+                        if (oldMapping.getLeftNameSpace().equals("Global")) {
+                            globalOutput = false;
+                        }
+                        removeOutputMapping(oldMapping);
+                    }       fire("order", null, null);
                 }
-                removeOutputMapping(oldMapping);
+            default -> {
             }
-            fire("order", null, null);
         }
     }
 }

+ 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/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()});
         }
     }
 }

+ 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));
         }

+ 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()});
         }
     }
 }

+ 0 - 2
jme3-materialeditor/src/com/jme3/gde/materialdefinition/navigator/node/ShaderNodeNode.java

@@ -5,9 +5,7 @@
 package com.jme3.gde.materialdefinition.navigator.node;
 
 import com.jme3.gde.core.assets.ProjectAssetManager;
-import com.jme3.gde.materialdefinition.MatDefDataObject;
 import com.jme3.gde.core.editor.nodes.Selectable;
-import com.jme3.gde.materialdefinition.fileStructure.MatDefBlock;
 import com.jme3.gde.materialdefinition.fileStructure.ShaderNodeBlock;
 import com.jme3.gde.materialdefinition.fileStructure.TechniqueBlock;
 import com.jme3.gde.materialdefinition.fileStructure.leaves.MappingBlock;

+ 3 - 4
jme3-materialeditor/src/com/jme3/gde/materialdefinition/navigator/node/properties/MatParamProperty.java

@@ -24,7 +24,6 @@ import com.jme3.math.Vector3f;
 import com.jme3.math.Vector4f;
 import com.jme3.shader.VarType;
 import com.jme3.texture.Texture;
-import java.beans.PropertyChangeListener;
 import java.beans.PropertyEditor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.logging.Level;
@@ -39,9 +38,9 @@ import org.openide.util.Lookup;
 @SuppressWarnings({"unchecked", "rawtypes"})
 public class MatParamProperty<T> extends Node.Property<T> {
 
-    private Lookup lookup;
-    private String type;
-    private Class<T> valueType;   
+    private final Lookup lookup;
+    private final String type;
+    private final Class<T> valueType;   
 
     public MatParamProperty(String name, String type, Class<T> valueType, Lookup lookup) {
         super(valueType);

+ 0 - 3
jme3-materialeditor/src/com/jme3/gde/materialdefinition/navigator/node/properties/VectorInplaceEditor.java

@@ -4,12 +4,9 @@
  */
 package com.jme3.gde.materialdefinition.navigator.node.properties;
 
-import com.jme3.math.Vector2f;
 import java.awt.Component;
 import java.awt.event.ActionListener;
 import java.beans.PropertyEditor;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import javax.swing.JComponent;
 import javax.swing.KeyStroke;
 import org.openide.explorer.propertysheet.InplaceEditor;

+ 6 - 5
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 */
@@ -59,7 +60,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);
@@ -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));

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

@@ -4,7 +4,6 @@
  */
 package com.jme3.gde.materials;
 
-import com.jme3.gde.materials.JMEMaterialDataObject;
 import com.jme3.gde.materials.multiview.MaterialEditorTopComponent;
 import org.openide.cookies.CloseCookie;
 import org.openide.cookies.OpenCookie;

+ 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);
         }
     }
 

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

@@ -35,7 +35,6 @@ import com.jme3.gde.core.dnd.AssetNameHolder;
 import com.jme3.gde.core.dnd.TextureDataFlavor;
 import java.awt.Cursor;
 import java.awt.datatransfer.Transferable;
-import java.awt.dnd.DropTargetContext;
 import java.awt.dnd.DropTargetDragEvent;
 import java.awt.dnd.DropTargetDropEvent;
 import java.awt.dnd.DropTargetEvent;

+ 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);
         }

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

@@ -10,7 +10,6 @@
  */
 package com.jme3.gde.materials.multiview.widgets;
 
-import com.jme3.gde.materials.multiview.widgets.icons.Icons;
 import com.jme3.math.FastMath;
 import java.awt.Color;
 import javax.swing.JFrame;

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

@@ -21,7 +21,7 @@ public class FloatPanel extends MaterialPropertyWidget {
     /** Creates new form NumberPanel */
     public FloatPanel() {
         initComponents();
-        jSpinner1.setModel(new javax.swing.SpinnerNumberModel(Float.valueOf(0.0f), null, null, Float.valueOf(0.1f)));
+        jSpinner1.setModel(new javax.swing.SpinnerNumberModel(0.0f, null, null, 0.1f));
     }
 
     /** This method is called from within the constructor to
@@ -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);
                 }

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

@@ -42,7 +42,7 @@ public class FloatPanelSmall extends MaterialPropertyWidget {
     /** Creates new form NumberPanel */
     public FloatPanelSmall() {
         initComponents();
-           jSpinner1.setModel(new javax.swing.SpinnerNumberModel(Float.valueOf(0.0f), null, null, Float.valueOf(0.1f)));
+           jSpinner1.setModel(new javax.swing.SpinnerNumberModel(0.0f, null, null, 0.1f));
     }
 
     /** This method is called from within the constructor to
@@ -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);
                 }

+ 0 - 3
jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/TextPanel.java

@@ -11,9 +11,6 @@
 
 package com.jme3.gde.materials.multiview.widgets;
 
-import java.lang.reflect.InvocationTargetException;
-import org.openide.util.Exceptions;
-
 /**
  *
  * @author normenhansen

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

@@ -37,7 +37,6 @@ import com.jme3.gde.core.assets.ProjectAssetManager;
 import com.jme3.gde.core.properties.TexturePropertyEditor;
 import com.jme3.gde.core.properties.preview.TexturePreview;
 import com.jme3.gde.materials.MaterialProperty;
-import com.jme3.gde.core.dnd.AssetNameHolder;
 import com.jme3.gde.materials.dnd.TextureDropTargetListener;
 import com.jme3.gde.materials.dnd.TextureDropTargetListener.TextureDropTarget;
 import com.jme3.gde.materials.multiview.MaterialEditorTopComponent;

+ 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){

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

@@ -6,7 +6,6 @@ package com.jme3.gde.modelimporter;
 
 
 import com.jme3.asset.AssetKey;
-import com.jme3.gde.core.assets.AssetData;
 import com.jme3.gde.core.util.PropertyUtils;
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Field;

+ 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 {

+ 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);

+ 3 - 6
jme3-navmesh-gen/src/com/jme3/gde/nmgen/NavMeshController.java

@@ -16,7 +16,6 @@ import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
 import com.jme3.scene.Spatial.CullHint;
 import com.jme3.terrain.Terrain;
-import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -29,17 +28,15 @@ import org.critterai.nmgen.IntermediateData;
  * @author sploreg
  */
 public class NavMeshController {
-    private JmeSpatial jmeRootNode;
-    private Node rootNode;
-    private AssetDataObject currentFileObject;
-    private NavMeshTopComponent topComponent;
+    private final JmeSpatial jmeRootNode;
+    private final Node rootNode;
+    private final AssetDataObject currentFileObject;
     //private NavMesh navMesh; // current nav mesh in this scene
     private Material navMaterial;
 
     public NavMeshController(JmeSpatial jmeRootNode, AssetDataObject currentFileObject, NavMeshTopComponent topComponent) {
         this.jmeRootNode = jmeRootNode;
         this.currentFileObject = currentFileObject;
-        this.topComponent = topComponent;
         rootNode = this.jmeRootNode.getLookup().lookup(Node.class);
     }
     

Some files were not shown because too many files changed in this diff