Fix imports etc

Author: tonihele

jme3-assetbrowser/src/com/jme3/gde/assetbrowser/AssetBrowser.java

@@ -44,7 +44,6 @@
 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.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;

jme3-assetbrowser/src/com/jme3/gde/assetbrowser/AssetBrowserTopComponent.java

@@ -36,7 +36,6 @@
 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.

jme3-assetpack-support/src/com/jme3/gde/assetpack/AssetPackLoader.java

@@ -8,7 +8,6 @@
 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;

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

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

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;

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

@@ -32,7 +32,6 @@
 package com.jme3.gde.core.appstates;
 
 import java.util.EnumSet;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;

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

@@ -33,7 +33,6 @@
 
 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) {

jme3-core/src/com/jme3/gde/core/assets/SpatialAssetDataObject.java

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

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.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());

jme3-core/src/com/jme3/gde/core/codeless/CodelessProjectLogicalView.java

@@ -15,7 +15,6 @@
 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;
 

jme3-core/src/com/jme3/gde/core/completion/ModelGenerator.java

@@ -36,7 +36,6 @@
 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;

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 @@
  */
 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;

jme3-core/src/com/jme3/gde/core/dnd/MaterialDropTargetListener.java

@@ -9,7 +9,6 @@
 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;

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

@@ -49,7 +49,6 @@
 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;

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

@@ -34,7 +34,6 @@
 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;

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;
 

jme3-core/src/com/jme3/gde/core/properties/ColorRGBAPropertyEditor.java

@@ -40,7 +40,6 @@
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyEditor;
-import java.util.Iterator;
 import java.util.LinkedList;
 
 /**
@@ -49,16 +48,16 @@
  */
 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);
             }
         }
     }

jme3-core/src/com/jme3/gde/core/properties/LightPropertyEditor.java

@@ -45,8 +45,6 @@
 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 @@
 
 
 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;
         }
     }
 

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

@@ -44,8 +44,6 @@
 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 @@
  */
 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, "");

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

@@ -96,19 +96,24 @@ public Void call() throws Exception {
                 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);

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

@@ -33,7 +33,6 @@
 
 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
 

jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeTerrainQuad.java

@@ -34,10 +34,7 @@
 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;
 
 /**

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

@@ -38,7 +38,6 @@
 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 ExtractSubAnimationDialog() {
         _radManual.setSelected(true);
         _txtCsvFilename.setEnabled(false);
         _btnBrowse.setEnabled(false);
-        _splitAnimationCount = 0;
     }
 
     public void setAnimation(Animation animation) {

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

@@ -41,7 +41,6 @@
 import com.jme3.gde.core.sceneexplorer.nodes.JmeParticleEmitter;
 import java.awt.EventQueue;
 import java.util.EnumSet;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;

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

@@ -40,7 +40,6 @@
 import com.jme3.gde.core.sceneexplorer.nodes.JmeSpatial;
 import java.awt.EventQueue;
 import java.util.EnumSet;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;

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

@@ -34,9 +34,7 @@
 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;

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>