diff --git a/ant-jme/src/com/jme/ant/LoadWikiImages.java b/ant-jme/src/com/jme/ant/LoadWikiImages.java index 12f824bbc..5691c4d43 100644 --- a/ant-jme/src/com/jme/ant/LoadWikiImages.java +++ b/ant-jme/src/com/jme/ant/LoadWikiImages.java @@ -9,6 +9,7 @@ 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 void execute() throws BuildException { 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 void execute() throws BuildException { } //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); diff --git a/jme3-android/src/com/jme3/gde/android/AndroidImportantFiles.java b/jme3-android/src/com/jme3/gde/android/AndroidImportantFiles.java index b96bb769c..8135b155b 100644 --- a/jme3-android/src/com/jme3/gde/android/AndroidImportantFiles.java +++ b/jme3-android/src/com/jme3/gde/android/AndroidImportantFiles.java @@ -82,7 +82,7 @@ public Node[] getNodes(Project project) { } catch (DataObjectNotFoundException ex) { Exceptions.printStackTrace(ex); } - return list.toArray(new Node[list.size()]); + return list.toArray(Node[]::new); } @Override diff --git a/jme3-android/src/com/jme3/gde/android/Installer.java b/jme3-android/src/com/jme3/gde/android/Installer.java index 0f5ed9d77..df43cc30a 100644 --- a/jme3-android/src/com/jme3/gde/android/Installer.java +++ b/jme3-android/src/com/jme3/gde/android/Installer.java @@ -33,7 +33,7 @@ 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 void restored() { 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."); diff --git a/jme3-assetbrowser/src/com/jme3/gde/assetbrowser/AssetBrowser.java b/jme3-assetbrowser/src/com/jme3/gde/assetbrowser/AssetBrowser.java index 7f4f06757..14ab678ee 100644 --- a/jme3-assetbrowser/src/com/jme3/gde/assetbrowser/AssetBrowser.java +++ b/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; diff --git a/jme3-assetbrowser/src/com/jme3/gde/assetbrowser/AssetBrowserTopComponent.java b/jme3-assetbrowser/src/com/jme3/gde/assetbrowser/AssetBrowserTopComponent.java index 670cf039c..230d18df5 100644 --- a/jme3-assetbrowser/src/com/jme3/gde/assetbrowser/AssetBrowserTopComponent.java +++ b/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. diff --git a/jme3-assetpack-support/src/com/jme3/gde/assetpack/AssetPackLoader.java b/jme3-assetpack-support/src/com/jme3/gde/assetpack/AssetPackLoader.java index 03d81999a..59ca956fe 100644 --- a/jme3-assetpack-support/src/com/jme3/gde/assetpack/AssetPackLoader.java +++ b/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; diff --git a/jme3-assetpack-support/src/com/jme3/gde/assetpack/browser/OnlineBrowser.java b/jme3-assetpack-support/src/com/jme3/gde/assetpack/browser/OnlineBrowser.java index 96478a675..52c14dbe5 100644 --- a/jme3-assetpack-support/src/com/jme3/gde/assetpack/browser/OnlineBrowser.java +++ b/jme3-assetpack-support/src/com/jme3/gde/assetpack/browser/OnlineBrowser.java @@ -14,6 +14,7 @@ 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 OnlineBrowser(AssetPackLibrary lib) { 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); diff --git a/jme3-assetpack-support/src/com/jme3/gde/assetpack/browser/properties/SelectionPropertyEditor.java b/jme3-assetpack-support/src/com/jme3/gde/assetpack/browser/properties/SelectionPropertyEditor.java index ae88ce16b..b2a3116ce 100644 --- a/jme3-assetpack-support/src/com/jme3/gde/assetpack/browser/properties/SelectionPropertyEditor.java +++ b/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; diff --git a/jme3-assetpack-support/src/com/jme3/gde/assetpack/online/OnlinePacksConnector.java b/jme3-assetpack-support/src/com/jme3/gde/assetpack/online/OnlinePacksConnector.java index 816016ee4..776b60c66 100644 --- a/jme3-assetpack-support/src/com/jme3/gde/assetpack/online/OnlinePacksConnector.java +++ b/jme3-assetpack-support/src/com/jme3/gde/assetpack/online/OnlinePacksConnector.java @@ -31,7 +31,7 @@ public static void upload(String urlString, String exsistingFileName, String use 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 static void upload(String urlString, String exsistingFileName, String use 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", "*/*"); diff --git a/jme3-assetpack-support/src/com/jme3/gde/assetpack/project/AssetPackProject.java b/jme3-assetpack-support/src/com/jme3/gde/assetpack/project/AssetPackProject.java index b956369e3..d8ee232b9 100644 --- a/jme3-assetpack-support/src/com/jme3/gde/assetpack/project/AssetPackProject.java +++ b/jme3-assetpack-support/src/com/jme3/gde/assetpack/project/AssetPackProject.java @@ -270,12 +270,14 @@ public void invokeAction(String string, Lookup lookup) throws IllegalArgumentExc @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 void showCustomizer() { @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(); + } } } diff --git a/jme3-assetpack-support/src/com/jme3/gde/assetpack/project/wizards/CreateProjectWizardPanel1.java b/jme3-assetpack-support/src/com/jme3/gde/assetpack/project/wizards/CreateProjectWizardPanel1.java index f9efd1805..09ff7b3ab 100644 --- a/jme3-assetpack-support/src/com/jme3/gde/assetpack/project/wizards/CreateProjectWizardPanel1.java +++ b/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; diff --git a/jme3-assetpack-support/src/com/jme3/gde/assetpack/project/wizards/ImportVisualPanel2.java b/jme3-assetpack-support/src/com/jme3/gde/assetpack/project/wizards/ImportVisualPanel2.java index e780c6993..14a00ec17 100644 --- a/jme3-assetpack-support/src/com/jme3/gde/assetpack/project/wizards/ImportVisualPanel2.java +++ b/jme3-assetpack-support/src/com/jme3/gde/assetpack/project/wizards/ImportVisualPanel2.java @@ -86,18 +86,15 @@ private void selectFile() { 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 + "/"; diff --git a/jme3-blender/src/com/jme3/gde/blender/scripts/Scripts.java b/jme3-blender/src/com/jme3/gde/blender/scripts/Scripts.java index 3bd7e356f..402089c8e 100644 --- a/jme3-blender/src/com/jme3/gde/blender/scripts/Scripts.java +++ b/jme3-blender/src/com/jme3/gde/blender/scripts/Scripts.java @@ -7,6 +7,7 @@ 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 @@ private static void checkScript(FileObject folder, String name) { 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(); diff --git a/jme3-core/src/com/jme3/gde/core/appstates/AppStateNode.java b/jme3-core/src/com/jme3/gde/core/appstates/AppStateNode.java index 05e07a466..8abf302f6 100644 --- a/jme3-core/src/com/jme3/gde/core/appstates/AppStateNode.java +++ b/jme3-core/src/com/jme3/gde/core/appstates/AppStateNode.java @@ -199,12 +199,12 @@ protected void createFields(Class c, Sheet.Set set, Object obj) throws SecurityE } 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 -> { + } } } } diff --git a/jme3-core/src/com/jme3/gde/core/appstates/NewAppStateVisualPanel1.java b/jme3-core/src/com/jme3/gde/core/appstates/NewAppStateVisualPanel1.java index 00aa9d1b7..126a804b9 100644 --- a/jme3-core/src/com/jme3/gde/core/appstates/NewAppStateVisualPanel1.java +++ b/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 @@ private List getSources() { ClassPath.getClassPath(sourceGroup.getRootFolder(), ClassPath.COMPILE), ClassPath.getClassPath(sourceGroup.getRootFolder(), ClassPath.SOURCE)); - HashSet set = new HashSet(); - set.add(ClassIndex.SearchScope.SOURCE); + Set set = EnumSet.of(ClassIndex.SearchScope.SOURCE); Set> types = cpInfo.getClassIndex().getDeclaredTypes("", NameKind.PREFIX, set); for (Iterator> it = types.iterator(); it.hasNext();) { final ElementHandle elementHandle = it.next(); diff --git a/jme3-core/src/com/jme3/gde/core/assets/ProjectAssetManager.java b/jme3-core/src/com/jme3/gde/core/assets/ProjectAssetManager.java index ee6ec150e..14798ec9c 100644 --- a/jme3-core/src/com/jme3/gde/core/assets/ProjectAssetManager.java +++ b/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 classPathListeners = Collections.synchronizedList(new LinkedList()); - private final List classPaths = Collections.synchronizedList(new LinkedList()); - private final List classPathItems = Collections.synchronizedList(new LinkedList()); - private final List assetEventListeners = Collections.synchronizedList(new LinkedList()); - private final List folderNames = new LinkedList(); - private final List jarItems = new LinkedList(); + private final List classPathListeners = Collections.synchronizedList(new LinkedList<>()); + private final List classPaths = Collections.synchronizedList(new LinkedList<>()); + private final List classPathItems = Collections.synchronizedList(new LinkedList<>()); + private final List assetEventListeners = Collections.synchronizedList(new LinkedList<>()); + private final List folderNames = new LinkedList<>(); + private final List jarItems = new LinkedList<>(); private URLClassLoader loader; public ProjectAssetManager(Project prj, String folderName) { @@ -275,12 +274,12 @@ private void fireChange(FileEvent fe) { 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 String getAbsoluteAssetPath(String path) { * @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); diff --git a/jme3-core/src/com/jme3/gde/core/assets/SpatialAssetDataObject.java b/jme3-core/src/com/jme3/gde/core/assets/SpatialAssetDataObject.java index 48f5223c2..fb082c32c 100644 --- a/jme3-core/src/com/jme3/gde/core/assets/SpatialAssetDataObject.java +++ b/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; /** * diff --git a/jme3-core/src/com/jme3/gde/core/assets/actions/ConvertModel.java b/jme3-core/src/com/jme3/gde/core/assets/actions/ConvertModel.java index 5f1ad291a..591bb149c 100644 --- a/jme3-core/src/com/jme3/gde/core/assets/actions/ConvertModel.java +++ b/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()); diff --git a/jme3-core/src/com/jme3/gde/core/assets/nodes/AssetChildren.java b/jme3-core/src/com/jme3/gde/core/assets/nodes/AssetChildren.java index 35c3ad594..ae691def4 100644 --- a/jme3-core/src/com/jme3/gde/core/assets/nodes/AssetChildren.java +++ b/jme3-core/src/com/jme3/gde/core/assets/nodes/AssetChildren.java @@ -68,7 +68,7 @@ protected Node[] createNodes(Node object) { } } - return result.toArray(new Node[0]); + return result.toArray(Node[]::new); } private boolean accept(Node node) { diff --git a/jme3-core/src/com/jme3/gde/core/codeless/CodelessProject.java b/jme3-core/src/com/jme3/gde/core/codeless/CodelessProject.java index e047c3bab..db2f590f2 100644 --- a/jme3-core/src/com/jme3/gde/core/codeless/CodelessProject.java +++ b/jme3-core/src/com/jme3/gde/core/codeless/CodelessProject.java @@ -143,12 +143,14 @@ public void invokeAction(String string, Lookup lookup) throws IllegalArgumentExc @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); } } } diff --git a/jme3-core/src/com/jme3/gde/core/codeless/CodelessProjectLogicalView.java b/jme3-core/src/com/jme3/gde/core/codeless/CodelessProjectLogicalView.java index 927b3f5a8..24d8c6408 100644 --- a/jme3-core/src/com/jme3/gde/core/codeless/CodelessProjectLogicalView.java +++ b/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; diff --git a/jme3-core/src/com/jme3/gde/core/completion/ModelGenerator.java b/jme3-core/src/com/jme3/gde/core/completion/ModelGenerator.java index eb4556e11..b7988ca06 100644 --- a/jme3-core/src/com/jme3/gde/core/completion/ModelGenerator.java +++ b/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; diff --git a/jme3-core/src/com/jme3/gde/core/dnd/AssetTransferable.java b/jme3-core/src/com/jme3/gde/core/dnd/AssetTransferable.java index ff025514a..b04434979 100644 --- a/jme3-core/src/com/jme3/gde/core/dnd/AssetTransferable.java +++ b/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 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; diff --git a/jme3-core/src/com/jme3/gde/core/dnd/MaterialDropTargetListener.java b/jme3-core/src/com/jme3/gde/core/dnd/MaterialDropTargetListener.java index 58f72c4bc..bf87b5800 100644 --- a/jme3-core/src/com/jme3/gde/core/dnd/MaterialDropTargetListener.java +++ b/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; diff --git a/jme3-core/src/com/jme3/gde/core/editor/nodes/NodePanel.java b/jme3-core/src/com/jme3/gde/core/editor/nodes/NodePanel.java index e0ed2813f..248f06df3 100644 --- a/jme3-core/src/com/jme3/gde/core/editor/nodes/NodePanel.java +++ b/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; diff --git a/jme3-core/src/com/jme3/gde/core/filters/AbstractFilterNode.java b/jme3-core/src/com/jme3/gde/core/filters/AbstractFilterNode.java index e7d2aa184..184bb6af7 100644 --- a/jme3-core/src/com/jme3/gde/core/filters/AbstractFilterNode.java +++ b/jme3-core/src/com/jme3/gde/core/filters/AbstractFilterNode.java @@ -255,7 +255,7 @@ protected Method[] createFields(Class c, Sheet.Set set, Object obj) throws Secur } } - return methodList.toArray(new Method[methodList.size()]); + return methodList.toArray(Method[]::new); } /** diff --git a/jme3-core/src/com/jme3/gde/core/filters/actions/EnableFiterAction.java b/jme3-core/src/com/jme3/gde/core/filters/actions/EnableFiterAction.java index 36abaa016..83b5c1603 100644 --- a/jme3-core/src/com/jme3/gde/core/filters/actions/EnableFiterAction.java +++ b/jme3-core/src/com/jme3/gde/core/filters/actions/EnableFiterAction.java @@ -41,6 +41,7 @@ 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 void actionPerformed(ActionEvent ev) { 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; diff --git a/jme3-core/src/com/jme3/gde/core/filters/impl/JmeFilter.java b/jme3-core/src/com/jme3/gde/core/filters/impl/JmeFilter.java index b072582db..be1b9f05b 100644 --- a/jme3-core/src/com/jme3/gde/core/filters/impl/JmeFilter.java +++ b/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; diff --git a/jme3-core/src/com/jme3/gde/core/icons/IconList.java b/jme3-core/src/com/jme3/gde/core/icons/IconList.java index 70ebc4609..0ce3a4d40 100644 --- a/jme3-core/src/com/jme3/gde/core/icons/IconList.java +++ b/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; diff --git a/jme3-core/src/com/jme3/gde/core/j2seproject/ProjectExtensionManager.java b/jme3-core/src/com/jme3/gde/core/j2seproject/ProjectExtensionManager.java index e2fe3b16e..99a80e638 100644 --- a/jme3-core/src/com/jme3/gde/core/j2seproject/ProjectExtensionManager.java +++ b/jme3-core/src/com/jme3/gde/core/j2seproject/ProjectExtensionManager.java @@ -39,6 +39,7 @@ 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 void setAntTaskLibrary(String antTaskLibrary) { 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 void setDataZipUrl(URL url) { */ 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 @@ private void removeZipContents(FileObject projectRoot) throws IOException { 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(); diff --git a/jme3-core/src/com/jme3/gde/core/j2seproject/actions/UpgradeProjectWizardPanel2.java b/jme3-core/src/com/jme3/gde/core/j2seproject/actions/UpgradeProjectWizardPanel2.java index 07654f210..e0ea092b6 100644 --- a/jme3-core/src/com/jme3/gde/core/j2seproject/actions/UpgradeProjectWizardPanel2.java +++ b/jme3-core/src/com/jme3/gde/core/j2seproject/actions/UpgradeProjectWizardPanel2.java @@ -148,7 +148,7 @@ public void doWork() { } } - 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) { diff --git a/jme3-core/src/com/jme3/gde/core/properties/ColorRGBAPropertyEditor.java b/jme3-core/src/com/jme3/gde/core/properties/ColorRGBAPropertyEditor.java index c8a3e3c4e..10c55f6b6 100644 --- a/jme3-core/src/com/jme3/gde/core/properties/ColorRGBAPropertyEditor.java +++ b/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 listeners = new LinkedList(); + private final LinkedList 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); } } } diff --git a/jme3-core/src/com/jme3/gde/core/properties/EmitterShapePropertyEditor.java b/jme3-core/src/com/jme3/gde/core/properties/EmitterShapePropertyEditor.java index f573162bb..5976940d6 100644 --- a/jme3-core/src/com/jme3/gde/core/properties/EmitterShapePropertyEditor.java +++ b/jme3-core/src/com/jme3/gde/core/properties/EmitterShapePropertyEditor.java @@ -128,28 +128,34 @@ public void setAsText(String text) throws IllegalArgumentException { 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); diff --git a/jme3-core/src/com/jme3/gde/core/properties/LightPropertyEditor.java b/jme3-core/src/com/jme3/gde/core/properties/LightPropertyEditor.java index 79205dc17..18207f066 100644 --- a/jme3-core/src/com/jme3/gde/core/properties/LightPropertyEditor.java +++ b/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 listeners = new LinkedList(); - private JmeLight jmeLight; + private final LinkedList 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; } } diff --git a/jme3-core/src/com/jme3/gde/core/properties/TextureBrowser.java b/jme3-core/src/com/jme3/gde/core/properties/TextureBrowser.java index 090b30b50..da9eaef9e 100644 --- a/jme3-core/src/com/jme3/gde/core/properties/TextureBrowser.java +++ b/jme3-core/src/com/jme3/gde/core/properties/TextureBrowser.java @@ -261,7 +261,7 @@ private void loadAvailableTextures() { String[] leaves = assetManager.getTextures(); List 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); diff --git a/jme3-core/src/com/jme3/gde/core/properties/UserDataProperty.java b/jme3-core/src/com/jme3/gde/core/properties/UserDataProperty.java index 4a7bedd63..69395ef9f 100644 --- a/jme3-core/src/com/jme3/gde/core/properties/UserDataProperty.java +++ b/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 { - private Spatial spatial; - private JmeSpatial node; + private final Spatial spatial; + private final JmeSpatial node; private String name = "null"; private int type = 0; - private List listeners = new LinkedList(); + private final List listeners = new LinkedList<>(); public UserDataProperty(JmeSpatial node, String name) { super(name, String.class, name, ""); @@ -103,19 +101,19 @@ public void setValue(final String val) throws IllegalAccessException, IllegalArg 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(); diff --git a/jme3-core/src/com/jme3/gde/core/properties/preview/TexturePreview.java b/jme3-core/src/com/jme3/gde/core/properties/preview/TexturePreview.java index 337e3a34c..2162acb94 100644 --- a/jme3-core/src/com/jme3/gde/core/properties/preview/TexturePreview.java +++ b/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); diff --git a/jme3-core/src/com/jme3/gde/core/scene/SceneApplication.java b/jme3-core/src/com/jme3/gde/core/scene/SceneApplication.java index 7930c28b0..187eeb031 100644 --- a/jme3-core/src/com/jme3/gde/core/scene/SceneApplication.java +++ b/jme3-core/src/com/jme3/gde/core/scene/SceneApplication.java @@ -67,7 +67,7 @@ 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 static void showStartupErrorMessage(Throwable exception) { @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); } diff --git a/jme3-core/src/com/jme3/gde/core/scene/controller/AbstractCameraController.java b/jme3-core/src/com/jme3/gde/core/scene/controller/AbstractCameraController.java index 91fb21936..032530354 100644 --- a/jme3-core/src/com/jme3/gde/core/scene/controller/AbstractCameraController.java +++ b/jme3-core/src/com/jme3/gde/core/scene/controller/AbstractCameraController.java @@ -319,54 +319,47 @@ protected boolean doToggleOrthoPerspMode() { 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); } } diff --git a/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/AbstractSceneExplorerNode.java b/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/AbstractSceneExplorerNode.java index b1b422d0c..51fe46018 100644 --- a/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/AbstractSceneExplorerNode.java +++ b/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/AbstractSceneExplorerNode.java @@ -289,13 +289,15 @@ public void syncSceneData(float tpf) { @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 -> { + } } } diff --git a/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeSpatial.java b/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeSpatial.java index 515fa0190..08a8ad9c5 100644 --- a/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeSpatial.java +++ b/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeSpatial.java @@ -304,7 +304,7 @@ protected Sheet createSheet() { //@TODO: multithreading.. but we only read Collection 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"); diff --git a/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeSpatialChildren.java b/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeSpatialChildren.java index 7b8ee5e26..28b1f6ce6 100644 --- a/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeSpatialChildren.java +++ b/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 { protected Spatial spatial; protected boolean readOnly = true; - protected HashMap map = new HashMap(); + protected HashMap map = new HashMap<>(); private DataObject dataObject; boolean hasKeys; // We use this to cache the keys, unless refresh is called diff --git a/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeTerrainGrid.java b/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeTerrainGrid.java index 7385ebf49..772787b96 100644 --- a/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeTerrainGrid.java +++ b/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeTerrainGrid.java @@ -115,7 +115,7 @@ public void gridMoved(Vector3f vctrf) { } 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 void run() { } 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); diff --git a/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeTerrainQuad.java b/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeTerrainQuad.java index eb024d986..73f4c8f70 100644 --- a/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeTerrainQuad.java +++ b/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; /** diff --git a/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeTrack.java b/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeTrack.java index 08e431a37..672aa678e 100644 --- a/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeTrack.java +++ b/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeTrack.java @@ -86,18 +86,11 @@ public JmeTrack(Track track, AnimControl control, DataObject obj) { } 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()); } } diff --git a/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/ExtractSubAnimationDialog.java b/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/ExtractSubAnimationDialog.java index 10499559f..7055d5a30 100644 --- a/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/ExtractSubAnimationDialog.java +++ b/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) { diff --git a/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/ParticleInfluencerPicker.java b/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/ParticleInfluencerPicker.java index 125f971e3..38b8a4386 100644 --- a/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/ParticleInfluencerPicker.java +++ b/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/ParticleInfluencerPicker.java @@ -40,7 +40,7 @@ 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 @@ private DefaultListModel getSources() { ClassPath.getClassPath(sourceGroup.getRootFolder(), ClassPath.COMPILE), ClassPath.getClassPath(sourceGroup.getRootFolder(), ClassPath.SOURCE)); - HashSet set = new HashSet(); - set.add(ClassIndex.SearchScope.SOURCE); + Set set = EnumSet.of(ClassIndex.SearchScope.SOURCE); Set> types = cpInfo.getClassIndex().getDeclaredTypes("", NameKind.PREFIX, set); for (Iterator> it = types.iterator(); it.hasNext();) { diff --git a/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/UserDataDialog.java b/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/UserDataDialog.java index bf8b8eeab..a6a930169 100644 --- a/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/UserDataDialog.java +++ b/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/UserDataDialog.java @@ -163,13 +163,13 @@ public Void call() throws Exception { 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); } diff --git a/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/UserDataPicker.java b/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/UserDataPicker.java index 486c24bbf..7a2576b27 100644 --- a/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/UserDataPicker.java +++ b/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/UserDataPicker.java @@ -39,7 +39,7 @@ 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 @@ private DefaultListModel getSources() { ClassPath.getClassPath(sourceGroup.getRootFolder(), ClassPath.COMPILE), ClassPath.getClassPath(sourceGroup.getRootFolder(), ClassPath.SOURCE)); - HashSet set = new HashSet(); - set.add(ClassIndex.SearchScope.SOURCE); + Set set = EnumSet.of(ClassIndex.SearchScope.SOURCE); Set> types = cpInfo.getClassIndex().getDeclaredTypes("", NameKind.PREFIX, set); for (Iterator> it = types.iterator(); it.hasNext();) { diff --git a/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/animation/AnimClipProperty.java b/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/animation/AnimClipProperty.java index 653576c16..3a86eca33 100644 --- a/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/animation/AnimClipProperty.java +++ b/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; diff --git a/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/NewCustomControlVisualPanel1.form b/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/NewCustomControlVisualPanel1.form index b831aea1a..ebcfef832 100644 --- a/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/NewCustomControlVisualPanel1.form +++ b/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/NewCustomControlVisualPanel1.form @@ -1,4 +1,4 @@ - +
diff --git a/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/NewCustomControlVisualPanel1.java b/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/NewCustomControlVisualPanel1.java index 50e3fe9e3..3adbe5b93 100644 --- a/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/NewCustomControlVisualPanel1.java +++ b/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 @@ private List getSources() { ClassPath.getClassPath(sourceGroup.getRootFolder(), ClassPath.COMPILE), ClassPath.getClassPath(sourceGroup.getRootFolder(), ClassPath.SOURCE)); - HashSet set = new HashSet(); - set.add(ClassIndex.SearchScope.SOURCE); + Set set = EnumSet.of(ClassIndex.SearchScope.SOURCE); Set> types = cpInfo.getClassIndex().getDeclaredTypes("", NameKind.PREFIX, set); for (Iterator> it = types.iterator(); it.hasNext();) { final ElementHandle elementHandle = it.next(); diff --git a/jme3-core/src/com/jme3/gde/core/util/ZipExtensionTool.java b/jme3-core/src/com/jme3/gde/core/util/ZipExtensionTool.java index e56a9b333..54ee38327 100644 --- a/jme3-core/src/com/jme3/gde/core/util/ZipExtensionTool.java +++ b/jme3-core/src/com/jme3/gde/core/util/ZipExtensionTool.java @@ -41,6 +41,7 @@ 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 @@ private boolean extractToolsShell(String zipPath, String extractionPath) { 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(); diff --git a/jme3-dark-laf/src/org/jme3/netbeans/plaf/darkmonkey/DMUtils.java b/jme3-dark-laf/src/org/jme3/netbeans/plaf/darkmonkey/DMUtils.java index 40470a535..d78c299f1 100644 --- a/jme3-dark-laf/src/org/jme3/netbeans/plaf/darkmonkey/DMUtils.java +++ b/jme3-dark-laf/src/org/jme3/netbeans/plaf/darkmonkey/DMUtils.java @@ -15,7 +15,6 @@ 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; diff --git a/jme3-dark-laf/src/org/jme3/netbeans/plaf/darkmonkey/DarkMonkeyIconFactory.java b/jme3-dark-laf/src/org/jme3/netbeans/plaf/darkmonkey/DarkMonkeyIconFactory.java index 4c640851b..061c896c2 100644 --- a/jme3-dark-laf/src/org/jme3/netbeans/plaf/darkmonkey/DarkMonkeyIconFactory.java +++ b/jme3-dark-laf/src/org/jme3/netbeans/plaf/darkmonkey/DarkMonkeyIconFactory.java @@ -10,12 +10,7 @@ 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; diff --git a/jme3-dark-laf/src/org/jme3/netbeans/plaf/darkmonkey/DarkMonkeyValidator.java b/jme3-dark-laf/src/org/jme3/netbeans/plaf/darkmonkey/DarkMonkeyValidator.java index cc5ef7c70..b18e5bc82 100644 --- a/jme3-dark-laf/src/org/jme3/netbeans/plaf/darkmonkey/DarkMonkeyValidator.java +++ b/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 diff --git a/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/JreDownloader.java b/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/JreDownloader.java index ff74ccec9..7d488f137 100644 --- a/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/JreDownloader.java +++ b/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/JreDownloader.java @@ -39,7 +39,7 @@ 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 static void downloadJre(String jreVersion, String platform, String locati 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); diff --git a/jme3-glsl-highlighter/src/com/jme3/gde/glsl/highlighter/lexer/GlslLexer.java b/jme3-glsl-highlighter/src/com/jme3/gde/glsl/highlighter/lexer/GlslLexer.java index fc1df6d49..3fd494798 100644 --- a/jme3-glsl-highlighter/src/com/jme3/gde/glsl/highlighter/lexer/GlslLexer.java +++ b/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 { private final LexerInput lexerInput; private final TokenFactory tokenFactory; - private final Logger log = Logger.getLogger(this.getClass().getCanonicalName()); private String thisLineSoFar = ""; @@ -74,34 +72,37 @@ public Token nextToken() { } } 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 Token nextToken() { 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 Token nextToken() { } } if (current == null) { - break; } switch (current) { case BASIC_TYPE: @@ -210,7 +203,9 @@ public Token nextToken() { return token(GlslTokenID.BUILTIN_FUNCTION); } } + } } + //Those have to be recognized separately for closing bracket recognition return token(GlslTokenID.TEXT); } diff --git a/jme3-gui/src/com/jme3/gde/gui/palette/NiftyGUIPaletteFactory.java b/jme3-gui/src/com/jme3/gde/gui/palette/NiftyGUIPaletteFactory.java index 340fbf0ce..207ef27c1 100644 --- a/jme3-gui/src/com/jme3/gde/gui/palette/NiftyGUIPaletteFactory.java +++ b/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.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; diff --git a/jme3-gui/src/com/jme3/gde/gui/palette/WidgetChildFactory.java b/jme3-gui/src/com/jme3/gde/gui/palette/WidgetChildFactory.java index 8a1c50ade..a04969509 100644 --- a/jme3-gui/src/com/jme3/gde/gui/palette/WidgetChildFactory.java +++ b/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; diff --git a/jme3-gui/src/com/jme3/gde/gui/palette/WidgetNode.java b/jme3-gui/src/com/jme3/gde/gui/palette/WidgetNode.java index 4f6faad23..84ca0f241 100644 --- a/jme3-gui/src/com/jme3/gde/gui/palette/WidgetNode.java +++ b/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; /** * diff --git a/jme3-gui/src/com/jme3/gde/gui/propertyeditors/ResourceEditor.java b/jme3-gui/src/com/jme3/gde/gui/propertyeditors/ResourceEditor.java index 805d4da7a..9aa69710c 100644 --- a/jme3-gui/src/com/jme3/gde/gui/propertyeditors/ResourceEditor.java +++ b/jme3-gui/src/com/jme3/gde/gui/propertyeditors/ResourceEditor.java @@ -10,8 +10,6 @@ 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; diff --git a/jme3-gui/src/com/jme3/gde/gui/propertyeditors/SizeEditor.java b/jme3-gui/src/com/jme3/gde/gui/propertyeditors/SizeEditor.java index 2abcc6f7b..a91c8d2a0 100644 --- a/jme3-gui/src/com/jme3/gde/gui/propertyeditors/SizeEditor.java +++ b/jme3-gui/src/com/jme3/gde/gui/propertyeditors/SizeEditor.java @@ -8,9 +8,6 @@ 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 @@ * @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 boolean supportsCustomEditor() { @Override public void attachEnv(PropertyEnv env) { - this.env = env; } @Override diff --git a/jme3-gui/src/com/jme3/gde/gui/swing/ConvertToNifty.java b/jme3-gui/src/com/jme3/gde/gui/swing/ConvertToNifty.java index 98f637992..ba7b7c7d2 100644 --- a/jme3-gui/src/com/jme3/gde/gui/swing/ConvertToNifty.java +++ b/jme3-gui/src/com/jme3/gde/gui/swing/ConvertToNifty.java @@ -71,7 +71,7 @@ public void actionPerformed(ActionEvent ev) { } } 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"); diff --git a/jme3-gui/src/com/jme3/gde/gui/view/Navigator.java b/jme3-gui/src/com/jme3/gde/gui/view/Navigator.java index 7041eacb6..824ff2874 100644 --- a/jme3-gui/src/com/jme3/gde/gui/view/Navigator.java +++ b/jme3-gui/src/com/jme3/gde/gui/view/Navigator.java @@ -7,7 +7,6 @@ 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; diff --git a/jme3-gui/src/com/jme3/gde/gui/view/NiftyGuiVisualElement.java b/jme3-gui/src/com/jme3/gde/gui/view/NiftyGuiVisualElement.java index b749b3cae..2da5a28e6 100644 --- a/jme3-gui/src/com/jme3/gde/gui/view/NiftyGuiVisualElement.java +++ b/jme3-gui/src/com/jme3/gde/gui/view/NiftyGuiVisualElement.java @@ -156,20 +156,16 @@ private void createToolbar() { @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 @@ private void loadGui() { Collection layers1 = this.editor.getGui().getLayers(); guiID = this.editor.getGui().getGUIid(); this.editor.getGui().addObserver(this); - DefaultComboBoxModel model = new DefaultComboBoxModel<>(layers1.toArray(new GLayer[0])); + DefaultComboBoxModel model = new DefaultComboBoxModel<>(layers1.toArray(GLayer[]::new)); layers.setModel(model); layers.setSelectedItem(this.editor.getCurrentLayer()); diff --git a/jme3-materialeditor/src/com/jme3/gde/materialdefinition/EditableMatDefFile.java b/jme3-materialeditor/src/com/jme3/gde/materialdefinition/EditableMatDefFile.java index 63fd429f3..c59c0b2e8 100644 --- a/jme3-materialeditor/src/com/jme3/gde/materialdefinition/EditableMatDefFile.java +++ b/jme3-materialeditor/src/com/jme3/gde/materialdefinition/EditableMatDefFile.java @@ -35,13 +35,9 @@ 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.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; diff --git a/jme3-materialeditor/src/com/jme3/gde/materialdefinition/dialog/AddNodeDialog.java b/jme3-materialeditor/src/com/jme3/gde/materialdefinition/dialog/AddNodeDialog.java index 7929ea8fe..0bdbcf2b9 100644 --- a/jme3-materialeditor/src/com/jme3/gde/materialdefinition/dialog/AddNodeDialog.java +++ b/jme3-materialeditor/src/com/jme3/gde/materialdefinition/dialog/AddNodeDialog.java @@ -246,7 +246,7 @@ private void fillList(final ProjectAssetManager mgr) { List l = new ArrayList(); 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); diff --git a/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/MatDefEditorlElement.java b/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/MatDefEditorlElement.java index b94717012..bce7f527d 100644 --- a/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/MatDefEditorlElement.java +++ b/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/MatDefEditorlElement.java @@ -58,10 +58,7 @@ 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.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 void notifyDefaultValueUpdated(String matParamName, String value){ 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); + } } } diff --git a/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/previews/BasePreview.java b/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/previews/BasePreview.java index a55831c2e..1d2cc92c3 100644 --- a/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/previews/BasePreview.java +++ b/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/previews/BasePreview.java @@ -48,7 +48,7 @@ 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 { diff --git a/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/previews/VecPreview.java b/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/previews/VecPreview.java index be9ae7616..29604c1e4 100644 --- a/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/previews/VecPreview.java +++ b/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/previews/VecPreview.java @@ -79,7 +79,7 @@ private boolean verifyString(String value) { private boolean verifyFloatString(String value) { try { - Float.parseFloat(value); + Float.valueOf(value); } catch (NumberFormatException ex) { logger.warning("Value is not valid float"); return false; diff --git a/jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/MaterialParametersBlock.java b/jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/MaterialParametersBlock.java index c5764c6ae..cd9da35c4 100644 --- a/jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/MaterialParametersBlock.java +++ b/jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/MaterialParametersBlock.java @@ -6,7 +6,6 @@ import com.jme3.gde.materialdefinition.fileStructure.leaves.MatParamBlock; import com.jme3.util.blockparser.Statement; -import java.util.ArrayList; import java.util.List; /** diff --git a/jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/ShaderNodeBlock.java b/jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/ShaderNodeBlock.java index a39cc7722..f82bd50b3 100644 --- a/jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/ShaderNodeBlock.java +++ b/jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/ShaderNodeBlock.java @@ -195,45 +195,48 @@ public void removeOutputMapping(OutputMappingBlock mapping) { } 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); } } } diff --git a/jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/UberStatement.java b/jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/UberStatement.java index f5e0b639d..548e51c44 100644 --- a/jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/UberStatement.java +++ b/jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/UberStatement.java @@ -32,7 +32,7 @@ public void removePropertyChangeListener(PropertyChangeListener pcl) { 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)); } diff --git a/jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/leaves/ConditionBlock.java b/jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/leaves/ConditionBlock.java index 60a040deb..4f4b6e05f 100644 --- a/jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/leaves/ConditionBlock.java +++ b/jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/leaves/ConditionBlock.java @@ -51,7 +51,7 @@ private void parse(Statement sta) { 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()}); } } } diff --git a/jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/leaves/DefinitionBlock.java b/jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/leaves/DefinitionBlock.java index 626808a33..e34f0d98c 100644 --- a/jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/leaves/DefinitionBlock.java +++ b/jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/leaves/DefinitionBlock.java @@ -66,7 +66,7 @@ private void parse(Statement sta) { } 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()}); } } } diff --git a/jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/leaves/InputMappingBlock.java b/jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/leaves/InputMappingBlock.java index ce46e86ee..bbe5d5c04 100644 --- a/jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/leaves/InputMappingBlock.java +++ b/jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/leaves/InputMappingBlock.java @@ -63,7 +63,7 @@ private void parse(Statement sta) { } } 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()}); } } } diff --git a/jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/leaves/LeafStatement.java b/jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/leaves/LeafStatement.java index 1ea84935d..f20120f86 100644 --- a/jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/leaves/LeafStatement.java +++ b/jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/leaves/LeafStatement.java @@ -31,7 +31,7 @@ public void removePropertyChangeListener(PropertyChangeListener pcl) { 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)); } diff --git a/jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/leaves/LightModeBlock.java b/jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/leaves/LightModeBlock.java index 6fd356aa0..4a45a0df6 100644 --- a/jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/leaves/LightModeBlock.java +++ b/jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/leaves/LightModeBlock.java @@ -54,9 +54,9 @@ private void parse(Statement sta) { 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()}); } } } diff --git a/jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/leaves/MatParamBlock.java b/jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/leaves/MatParamBlock.java index 5218420a8..4f347a745 100644 --- a/jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/leaves/MatParamBlock.java +++ b/jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/leaves/MatParamBlock.java @@ -126,7 +126,7 @@ private void parse(Statement sta) { } 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()}); } } } diff --git a/jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/leaves/ShaderFileBlock.java b/jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/leaves/ShaderFileBlock.java index 47ef2cf56..f61fc817c 100644 --- a/jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/leaves/ShaderFileBlock.java +++ b/jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/leaves/ShaderFileBlock.java @@ -45,9 +45,9 @@ private void parse(Statement sta) { 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()}); } } } diff --git a/jme3-materialeditor/src/com/jme3/gde/materialdefinition/navigator/node/ShaderNodeNode.java b/jme3-materialeditor/src/com/jme3/gde/materialdefinition/navigator/node/ShaderNodeNode.java index a20bc3def..b594b5e4e 100644 --- a/jme3-materialeditor/src/com/jme3/gde/materialdefinition/navigator/node/ShaderNodeNode.java +++ b/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; diff --git a/jme3-materialeditor/src/com/jme3/gde/materialdefinition/navigator/node/properties/MatParamProperty.java b/jme3-materialeditor/src/com/jme3/gde/materialdefinition/navigator/node/properties/MatParamProperty.java index 2dde6e780..7797881c7 100644 --- a/jme3-materialeditor/src/com/jme3/gde/materialdefinition/navigator/node/properties/MatParamProperty.java +++ b/jme3-materialeditor/src/com/jme3/gde/materialdefinition/navigator/node/properties/MatParamProperty.java @@ -24,7 +24,6 @@ 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 @@ @SuppressWarnings({"unchecked", "rawtypes"}) public class MatParamProperty extends Node.Property { - private Lookup lookup; - private String type; - private Class valueType; + private final Lookup lookup; + private final String type; + private final Class valueType; public MatParamProperty(String name, String type, Class valueType, Lookup lookup) { super(valueType); diff --git a/jme3-materialeditor/src/com/jme3/gde/materialdefinition/navigator/node/properties/VectorInplaceEditor.java b/jme3-materialeditor/src/com/jme3/gde/materialdefinition/navigator/node/properties/VectorInplaceEditor.java index c62dc7b35..6a5d86e4f 100644 --- a/jme3-materialeditor/src/com/jme3/gde/materialdefinition/navigator/node/properties/VectorInplaceEditor.java +++ b/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; diff --git a/jme3-materialeditor/src/com/jme3/gde/materials/MaterialBrowser.java b/jme3-materialeditor/src/com/jme3/gde/materials/MaterialBrowser.java index 541d22bc8..37b453e48 100644 --- a/jme3-materialeditor/src/com/jme3/gde/materials/MaterialBrowser.java +++ b/jme3-materialeditor/src/com/jme3/gde/materials/MaterialBrowser.java @@ -21,6 +21,7 @@ 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 @@ */ 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 @@ private void loadAvailableMaterials() { String[] leaves = assetManager.getMaterials(); List 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 @@ private boolean setMaterial() { 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)); diff --git a/jme3-materialeditor/src/com/jme3/gde/materials/MaterialPreviewOpenSupport.java b/jme3-materialeditor/src/com/jme3/gde/materials/MaterialPreviewOpenSupport.java index 004572f96..273b378d7 100644 --- a/jme3-materialeditor/src/com/jme3/gde/materials/MaterialPreviewOpenSupport.java +++ b/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; diff --git a/jme3-materialeditor/src/com/jme3/gde/materials/MaterialPropertyEditor.java b/jme3-materialeditor/src/com/jme3/gde/materials/MaterialPropertyEditor.java index 04cb6d3ea..f2761c468 100644 --- a/jme3-materialeditor/src/com/jme3/gde/materials/MaterialPropertyEditor.java +++ b/jme3-materialeditor/src/com/jme3/gde/materials/MaterialPropertyEditor.java @@ -178,7 +178,7 @@ public String[] getTags() { String[] matsUnsorted = request.getManager().getMaterials(); List 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 String[] getTags() { String[] matsUnsorted = request.getManager().getMaterials(); List matList = Arrays.asList(matsUnsorted); Collections.sort(matList); - return matList.toArray(new String[0]); + return matList.toArray(String[]::new); } } diff --git a/jme3-materialeditor/src/com/jme3/gde/materials/dnd/TextureDropTargetListener.java b/jme3-materialeditor/src/com/jme3/gde/materials/dnd/TextureDropTargetListener.java index fa6a4ae29..8d8fac8fd 100644 --- a/jme3-materialeditor/src/com/jme3/gde/materials/dnd/TextureDropTargetListener.java +++ b/jme3-materialeditor/src/com/jme3/gde/materials/dnd/TextureDropTargetListener.java @@ -35,7 +35,6 @@ 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; diff --git a/jme3-materialeditor/src/com/jme3/gde/materials/multiview/MaterialEditorTopComponent.java b/jme3-materialeditor/src/com/jme3/gde/materials/multiview/MaterialEditorTopComponent.java index da5e46e37..9c9cf38fc 100644 --- a/jme3-materialeditor/src/com/jme3/gde/materials/multiview/MaterialEditorTopComponent.java +++ b/jme3-materialeditor/src/com/jme3/gde/materials/multiview/MaterialEditorTopComponent.java @@ -587,7 +587,7 @@ public void setMatDefList(final String[] matDefs, String selected) { jComboBox1.addItem(""); List 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); } diff --git a/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/ColorPanel.java b/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/ColorPanel.java index 7c57d990f..509ccc4d0 100644 --- a/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/ColorPanel.java +++ b/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; diff --git a/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/FloatPanel.java b/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/FloatPanel.java index 557fe55e7..784756c3b 100644 --- a/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/FloatPanel.java +++ b/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 void run() { MaterialProperty prop = property; property = null; try { - jSpinner1.setValue(Float.parseFloat(prop.getValue())); + jSpinner1.setValue(Float.valueOf(prop.getValue())); } catch (Exception e) { jSpinner1.setValue(0); } diff --git a/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/FloatPanelSmall.java b/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/FloatPanelSmall.java index 408e1f1ca..64a105512 100644 --- a/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/FloatPanelSmall.java +++ b/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 void run() { MaterialProperty prop = property; property = null; try { - jSpinner1.setValue(Float.parseFloat(prop.getValue())); + jSpinner1.setValue(Float.valueOf(prop.getValue())); } catch (Exception e) { jSpinner1.setValue(0); } diff --git a/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/IntPanel.java b/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/IntPanel.java index 0bc679f6a..7991c5e0d 100644 --- a/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/IntPanel.java +++ b/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/IntPanel.java @@ -87,7 +87,7 @@ public void run() { MaterialProperty prop=property; property=null; try { - jSpinner1.setValue(Integer.parseInt(prop.getValue())); + jSpinner1.setValue(Integer.valueOf(prop.getValue())); } catch (Exception e) { jSpinner1.setValue(0); } diff --git a/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/TextPanel.java b/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/TextPanel.java index 8b6bf8110..6f37435fe 100644 --- a/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/TextPanel.java +++ b/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 diff --git a/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/TexturePanelSquare.java b/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/TexturePanelSquare.java index b250d746a..a116bb43e 100644 --- a/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/TexturePanelSquare.java +++ b/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/TexturePanelSquare.java @@ -37,7 +37,6 @@ 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; diff --git a/jme3-materialeditor/src/com/jme3/gde/materials/nvcompress/NVCompress.java b/jme3-materialeditor/src/com/jme3/gde/materials/nvcompress/NVCompress.java index d0344a42f..1fdd56026 100644 --- a/jme3-materialeditor/src/com/jme3/gde/materials/nvcompress/NVCompress.java +++ b/jme3-materialeditor/src/com/jme3/gde/materials/nvcompress/NVCompress.java @@ -395,7 +395,7 @@ private String[] computeCompressParameters(){ case 8: params.add("-bc5"); break; } - return params.toArray(new String[0]); + return params.toArray(String[]::new); } private void updateWork(String workStatus, int percent){ diff --git a/jme3-model-importer/src/com/jme3/gde/modelimporter/ImportKeyNode.java b/jme3-model-importer/src/com/jme3/gde/modelimporter/ImportKeyNode.java index 93376e643..74cae55c6 100644 --- a/jme3-model-importer/src/com/jme3/gde/modelimporter/ImportKeyNode.java +++ b/jme3-model-importer/src/com/jme3/gde/modelimporter/ImportKeyNode.java @@ -6,7 +6,6 @@ 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; diff --git a/jme3-model-importer/src/com/jme3/gde/modelimporter/ModelImporterVisualPanel3.java b/jme3-model-importer/src/com/jme3/gde/modelimporter/ModelImporterVisualPanel3.java index 51c0578e3..c60963e1d 100644 --- a/jme3-model-importer/src/com/jme3/gde/modelimporter/ModelImporterVisualPanel3.java +++ b/jme3-model-importer/src/com/jme3/gde/modelimporter/ModelImporterVisualPanel3.java @@ -106,7 +106,7 @@ private void loadModel() { } 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 { diff --git a/jme3-model-importer/src/com/jme3/gde/modelimporter/UberAssetLocator.java b/jme3-model-importer/src/com/jme3/gde/modelimporter/UberAssetLocator.java index f8fdbcd9a..05ccfcea3 100644 --- a/jme3-model-importer/src/com/jme3/gde/modelimporter/UberAssetLocator.java +++ b/jme3-model-importer/src/com/jme3/gde/modelimporter/UberAssetLocator.java @@ -153,7 +153,7 @@ private FileObject findFile(AssetKey key) { 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 @@ private FileObject findFile(AssetKey key) { 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); diff --git a/jme3-navmesh-gen/src/com/jme3/gde/nmgen/NavMeshController.java b/jme3-navmesh-gen/src/com/jme3/gde/nmgen/NavMeshController.java index ee7b20b66..ec7c3c5e8 100644 --- a/jme3-navmesh-gen/src/com/jme3/gde/nmgen/NavMeshController.java +++ b/jme3-navmesh-gen/src/com/jme3/gde/nmgen/NavMeshController.java @@ -16,7 +16,6 @@ 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 @@ * @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); } diff --git a/jme3-navmesh-gen/src/com/jme3/gde/nmgen/NavMeshGenerator.java b/jme3-navmesh-gen/src/com/jme3/gde/nmgen/NavMeshGenerator.java index 12062b43f..8195f579e 100644 --- a/jme3-navmesh-gen/src/com/jme3/gde/nmgen/NavMeshGenerator.java +++ b/jme3-navmesh-gen/src/com/jme3/gde/nmgen/NavMeshGenerator.java @@ -129,8 +129,7 @@ private static void execute(Thread task, long timeout) throws TimeoutException { } catch (InterruptedException e) { } if (task.isAlive()) { -// task.interrupt(); - task.stop(); + task.interrupt(); throw new TimeoutException(); } } diff --git a/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/CameraPositionTrackerAppState.java b/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/CameraPositionTrackerAppState.java index c342544bc..aa5f53f9f 100644 --- a/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/CameraPositionTrackerAppState.java +++ b/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/CameraPositionTrackerAppState.java @@ -35,7 +35,6 @@ import com.jme3.app.state.BaseAppState; import com.jme3.math.Vector3f; import com.jme3.renderer.Camera; -import java.text.DecimalFormat; import javax.swing.JLabel; import javax.swing.SwingUtilities; diff --git a/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerToolController.java b/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerToolController.java index e61c7c6c4..493f0730c 100644 --- a/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerToolController.java +++ b/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerToolController.java @@ -386,12 +386,12 @@ public void setSelectGeometries(boolean selectGeometries) { public void setTransformationType(String type) { if (type != null) { - if (type.equals("Local")) { - setTransformationType(TransformationType.local); - } else if (type.equals("Global")) { - setTransformationType(TransformationType.global); - } else if (type.equals("Camera")) { - setTransformationType(TransformationType.camera); + switch (type) { + case "Local" -> setTransformationType(TransformationType.local); + case "Global" -> setTransformationType(TransformationType.global); + case "Camera" -> setTransformationType(TransformationType.camera); + default -> { + } } } } diff --git a/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneEditTool.java b/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneEditTool.java index c5187d9a8..83365d341 100644 --- a/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneEditTool.java +++ b/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneEditTool.java @@ -373,23 +373,35 @@ protected Vector3f pickAxisMarker(Camera cam, Vector2f mouseLoc, AxisMarkerPickT String collisionName = cr.getGeometry().getName(); - if (pickType != null) { + if (pickType != null && collisionName != null) { if (pickType == AxisMarkerPickType.planeOnly || pickType == AxisMarkerPickType.axisAndPlane) { - if ("quadXY".equals(collisionName) || "circleXY".equals(collisionName)) { - return QUAD_XY; - } else if ("quadXZ".equals(collisionName) || "circleXZ".equals(collisionName)) { - return QUAD_XZ; - } else if ("quadYZ".equals(collisionName) || "circleYZ".equals(collisionName)) { - return QUAD_YZ; + switch (collisionName) { + case "quadXY", "circleXY" -> { + return QUAD_XY; + } + case "quadXZ", "circleXZ" -> { + return QUAD_XZ; + } + case "quadYZ", "circleYZ" -> { + return QUAD_YZ; + } + default -> { + } } } if (pickType == AxisMarkerPickType.axisOnly || pickType == AxisMarkerPickType.axisAndPlane) { - if ("arrowX".equals(collisionName) || "coneX".equals(collisionName) || "boxX".equals(collisionName)) { - return ARROW_X; - } else if ("arrowY".equals(collisionName) || "coneY".equals(collisionName) || "boxY".equals(collisionName)) { - return ARROW_Y; - } else if ("arrowZ".equals(collisionName) || "coneZ".equals(collisionName) || "boxZ".equals(collisionName)) { - return ARROW_Z; + switch (collisionName) { + case "arrowX", "coneX", "boxX" -> { + return ARROW_X; + } + case "arrowY", "coneY", "boxY" -> { + return ARROW_Y; + } + case "arrowZ", "coneZ", "boxZ" -> { + return ARROW_Z; + } + default -> { + } } } } diff --git a/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/gizmo/audio/AudioGizmoFactory.java b/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/gizmo/audio/AudioGizmoFactory.java index f1212e393..9d872c3ba 100644 --- a/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/gizmo/audio/AudioGizmoFactory.java +++ b/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/gizmo/audio/AudioGizmoFactory.java @@ -18,7 +18,6 @@ import com.jme3.scene.Node; import com.jme3.scene.Spatial; import com.jme3.scene.control.BillboardControl; -import com.jme3.scene.control.Control; import com.jme3.scene.shape.Quad; import com.jme3.texture.Texture; @@ -28,8 +27,6 @@ */ public class AudioGizmoFactory { - private Material audioMarkerMaterial; - public static Spatial createGizmo(AssetManager assetManager, JmeAudioNode node) { AudioNode audio = node.getLookup().lookup(AudioNode.class); if (audio == null) { diff --git a/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/gizmo/light/LightGizmoFactory.java b/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/gizmo/light/LightGizmoFactory.java index e063310bd..26fbe6ec0 100644 --- a/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/gizmo/light/LightGizmoFactory.java +++ b/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/gizmo/light/LightGizmoFactory.java @@ -6,7 +6,6 @@ package com.jme3.gde.scenecomposer.gizmo.light; import com.jme3.asset.AssetManager; -import com.jme3.environment.util.BoundingSphereDebug; import com.jme3.gde.scenecomposer.gizmo.light.shape.ProbeRadiusShape; import com.jme3.gde.core.sceneexplorer.nodes.JmeDirectionalLight; import com.jme3.gde.core.sceneexplorer.nodes.JmeLight; @@ -15,11 +14,9 @@ import com.jme3.gde.core.sceneexplorer.nodes.JmeSpotLight; import com.jme3.gde.scenecomposer.gizmo.shape.RadiusShape; import com.jme3.gde.scenecomposer.gizmo.shape.Triangle; -import com.jme3.light.DirectionalLight; import com.jme3.light.Light; import com.jme3.light.PointLight; import com.jme3.light.SpotLight; -import com.jme3.light.LightProbe; import com.jme3.material.Material; import com.jme3.material.RenderState; import com.jme3.math.ColorRGBA; diff --git a/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/gizmo/light/PointLightGizmo.java b/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/gizmo/light/PointLightGizmo.java index 9ddbd6ef8..aeaf67491 100644 --- a/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/gizmo/light/PointLightGizmo.java +++ b/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/gizmo/light/PointLightGizmo.java @@ -5,24 +5,21 @@ */ package com.jme3.gde.scenecomposer.gizmo.light; -import com.jme3.bounding.BoundingBox; import com.jme3.bounding.BoundingSphere; import com.jme3.bounding.BoundingVolume; import com.jme3.gde.core.sceneexplorer.nodes.JmePointLight; import com.jme3.gde.scenecomposer.gizmo.NodeCallback; import com.jme3.light.PointLight; -import com.jme3.math.FastMath; import com.jme3.math.Quaternion; import com.jme3.math.Vector3f; -import com.jme3.scene.Spatial; /** * Updates the marker's position whenever the light has moved. */ public class PointLightGizmo extends NodeCallback { - private PointLight light; - private JmePointLight jmeLight; + private final PointLight light; + private final JmePointLight jmeLight; public PointLightGizmo(JmePointLight jmelight) { super("point light callback", true, false, false); diff --git a/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/gizmo/light/SpotLightGizmo.java b/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/gizmo/light/SpotLightGizmo.java index 500eb5ca6..8946e8123 100644 --- a/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/gizmo/light/SpotLightGizmo.java +++ b/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/gizmo/light/SpotLightGizmo.java @@ -13,7 +13,6 @@ import com.jme3.math.FastMath; import com.jme3.math.Quaternion; import com.jme3.math.Vector3f; -import com.jme3.scene.Spatial; /** * @@ -21,8 +20,8 @@ */ public class SpotLightGizmo extends NodeCallback { - private SpotLight light; - private JmeSpotLight jmeLight; + private final SpotLight light; + private final JmeSpotLight jmeLight; public SpotLightGizmo(JmeSpotLight jmelight) { super("spot light callback", true, true, false); diff --git a/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/tools/shortcuts/DeleteShortcut.java b/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/tools/shortcuts/DeleteShortcut.java index a439617c5..568aa6a6e 100644 --- a/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/tools/shortcuts/DeleteShortcut.java +++ b/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/tools/shortcuts/DeleteShortcut.java @@ -6,10 +6,7 @@ package com.jme3.gde.scenecomposer.tools.shortcuts; import com.jme3.asset.AssetManager; -import com.jme3.gde.core.sceneexplorer.SceneExplorerTopComponent; import com.jme3.gde.core.sceneexplorer.nodes.JmeNode; -import com.jme3.gde.core.sceneexplorer.nodes.JmeSpatial; -import com.jme3.gde.core.sceneviewer.SceneViewerTopComponent; import com.jme3.gde.core.undoredo.AbstractUndoableSceneEdit; import com.jme3.gde.scenecomposer.SceneComposerToolController; import com.jme3.input.KeyInput; diff --git a/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/tools/shortcuts/DuplicateShortcut.java b/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/tools/shortcuts/DuplicateShortcut.java index 91e58c3b5..2f910a0f5 100644 --- a/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/tools/shortcuts/DuplicateShortcut.java +++ b/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/tools/shortcuts/DuplicateShortcut.java @@ -8,7 +8,6 @@ import com.jme3.asset.AssetManager; import com.jme3.gde.core.sceneexplorer.SceneExplorerTopComponent; import com.jme3.gde.core.sceneexplorer.nodes.JmeNode; -import com.jme3.gde.core.sceneexplorer.nodes.JmeSpatial; import com.jme3.gde.core.sceneviewer.SceneViewerTopComponent; import com.jme3.gde.core.undoredo.AbstractUndoableSceneEdit; import com.jme3.gde.scenecomposer.SceneComposerToolController; diff --git a/jme3-terrain-editor/src/com/jme3/gde/terraineditor/CreateTerrainVisualPanel2.java b/jme3-terrain-editor/src/com/jme3/gde/terraineditor/CreateTerrainVisualPanel2.java index dbceb0feb..ceb79ace3 100644 --- a/jme3-terrain-editor/src/com/jme3/gde/terraineditor/CreateTerrainVisualPanel2.java +++ b/jme3-terrain-editor/src/com/jme3/gde/terraineditor/CreateTerrainVisualPanel2.java @@ -436,7 +436,7 @@ public float getSmoothEffect() { public float getHeightScale() { try { - Float scale = Float.parseFloat(heightScale.getText()); + Float scale = Float.valueOf(heightScale.getText()); return Math.abs(scale); } catch (NumberFormatException e) { return 1; diff --git a/jme3-terrain-editor/src/com/jme3/gde/terraineditor/TerrainEditorTopComponent.java b/jme3-terrain-editor/src/com/jme3/gde/terraineditor/TerrainEditorTopComponent.java index 816afb546..ffd3d63be 100644 --- a/jme3-terrain-editor/src/com/jme3/gde/terraineditor/TerrainEditorTopComponent.java +++ b/jme3-terrain-editor/src/com/jme3/gde/terraineditor/TerrainEditorTopComponent.java @@ -792,7 +792,7 @@ private void smoothTerrainButtonActionPerformed(java.awt.event.ActionEvent evt) private void shininessFieldActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_shininessFieldActionPerformed try { - Float f = Float.parseFloat(shininessField.getText()); + Float f = Float.valueOf(shininessField.getText()); editorController.setShininess(Math.max(0, f)); } catch (Exception e) { Logger.getLogger(TerrainEditorTopComponent.class.getName()).log(Level.WARNING, @@ -936,7 +936,7 @@ public boolean verify(JComponent input) { try { javax.swing.JTextField textField = (javax.swing.JTextField)input; String a=textField.getText(); - Float.parseFloat(a); + Float.valueOf(a); } catch (NumberFormatException e) { Toolkit.getDefaultToolkit().beep(); @@ -952,7 +952,7 @@ public boolean verify(JComponent input) { if (input instanceof javax.swing.JTextField) { String text = ((javax.swing.JTextField)input).getText(); try { - Float f = Float.parseFloat(text); + Float f = Float.valueOf(text); if (f > 0) return true; } catch (Exception e) { @@ -1032,17 +1032,21 @@ public void addSpatial(final String name) { final Spatial node = selectedSpat.getLookup().lookup(Spatial.class); if (node != null) { - if ("Terrain".equals(name)) { - if (terrainWizard == null) { - terrainWizard = new CreateTerrainWizardAction(this); + if (null != name) switch (name) { + case "Terrain" -> { + if (terrainWizard == null) { + terrainWizard = new CreateTerrainWizardAction(this); + } terrainWizard.performAction(); } - terrainWizard.performAction(); - } else if ("Skybox".equals(name)) { - if (skyboxWizard == null) { - skyboxWizard = new SkyboxWizardAction(this); + case "Skybox" -> { + if (skyboxWizard == null) { + skyboxWizard = new SkyboxWizardAction(this); + } skyboxWizard.performAction(); + } + case "Ocean" -> { + } + default -> { } - skyboxWizard.performAction(); - } else if ("Ocean".equals(name)) { } } diff --git a/jme3-terrain-editor/src/com/jme3/gde/terraineditor/TerrainToolController.java b/jme3-terrain-editor/src/com/jme3/gde/terraineditor/TerrainToolController.java index 0ab6d009f..f12ced460 100644 --- a/jme3-terrain-editor/src/com/jme3/gde/terraineditor/TerrainToolController.java +++ b/jme3-terrain-editor/src/com/jme3/gde/terraineditor/TerrainToolController.java @@ -35,17 +35,13 @@ import com.jme3.asset.AssetManager; import com.jme3.gde.core.scene.SceneApplication; import com.jme3.gde.core.scene.controller.SceneToolController; -import com.jme3.gde.core.sceneexplorer.nodes.AbstractSceneExplorerNode; import com.jme3.gde.core.sceneexplorer.nodes.JmeNode; import com.jme3.gde.core.sceneexplorer.nodes.JmeSpatial; import com.jme3.gde.terraineditor.tools.TerrainTool; import com.jme3.input.event.KeyInputEvent; import com.jme3.math.Vector3f; import com.jme3.scene.Node; -import com.jme3.scene.Spatial; -import com.jme3.terrain.Terrain; import java.util.concurrent.Callable; -import org.openide.loaders.DataObject; /** * The controller for the terrain modification tools. It will in turn interact @@ -57,7 +53,7 @@ */ public class TerrainToolController extends SceneToolController { - private JmeSpatial jmeRootNode; + private final JmeSpatial jmeRootNode; private TerrainTool terrainTool; private TerrainEditorController editorController; private TerrainCameraController cameraController; diff --git a/jme3-terrain-editor/src/com/jme3/gde/terraineditor/sky/SkyboxVisualPanel2.java b/jme3-terrain-editor/src/com/jme3/gde/terraineditor/sky/SkyboxVisualPanel2.java index 286ef9147..f78cde39b 100644 --- a/jme3-terrain-editor/src/com/jme3/gde/terraineditor/sky/SkyboxVisualPanel2.java +++ b/jme3-terrain-editor/src/com/jme3/gde/terraineditor/sky/SkyboxVisualPanel2.java @@ -35,16 +35,12 @@ import com.jme3.gde.core.properties.TexturePropertyEditor; import com.jme3.gde.core.properties.preview.TexturePreview; import com.jme3.gde.core.scene.SceneApplication; -import com.jme3.texture.Texture; import com.jme3.util.SkyFactory; import java.awt.Component; import javax.swing.DefaultComboBoxModel; -import javax.swing.Icon; import javax.swing.JCheckBox; import javax.swing.JPanel; import javax.swing.JTextField; -import jme3tools.converters.ImageToAwt; -import org.openide.util.ImageUtilities; @SuppressWarnings({"unchecked", "rawtypes"}) public final class SkyboxVisualPanel2 extends JPanel { diff --git a/jme3-terrain-editor/src/com/jme3/gde/terraineditor/tools/RaiseTerrainTool.java b/jme3-terrain-editor/src/com/jme3/gde/terraineditor/tools/RaiseTerrainTool.java index 268268b28..c8d5b48bc 100644 --- a/jme3-terrain-editor/src/com/jme3/gde/terraineditor/tools/RaiseTerrainTool.java +++ b/jme3-terrain-editor/src/com/jme3/gde/terraineditor/tools/RaiseTerrainTool.java @@ -31,7 +31,6 @@ */ package com.jme3.gde.terraineditor.tools; -import com.jme3.asset.AssetManager; import com.jme3.gde.core.sceneexplorer.nodes.AbstractSceneExplorerNode; import com.jme3.gde.core.undoredo.AbstractUndoableSceneEdit; import com.jme3.gde.core.undoredo.SceneUndoRedoManager; diff --git a/jme3-welcome-screen/src/com/jme3/gde/welcome/WelcomeScreenTopComponent.java b/jme3-welcome-screen/src/com/jme3/gde/welcome/WelcomeScreenTopComponent.java index 3648916ab..0b4682f60 100644 --- a/jme3-welcome-screen/src/com/jme3/gde/welcome/WelcomeScreenTopComponent.java +++ b/jme3-welcome-screen/src/com/jme3/gde/welcome/WelcomeScreenTopComponent.java @@ -35,6 +35,7 @@ import java.io.IOException; import java.io.InputStreamReader; import java.net.MalformedURLException; +import java.net.URI; import java.net.URL; import java.net.URLConnection; import java.util.logging.Level; @@ -96,7 +97,7 @@ public void loadPage() { } while (checkOpenThread == null || checkOpenThread.isAlive()); /* Wait for first getModified (static executed from NB) to finish */ - final URL startUrl = new URL(org.openide.util.NbBundle.getMessage(WelcomeScreenTopComponent.class, "WelcomeScreenTopComponent.http.link")); + final URL startUrl = URI.create(org.openide.util.NbBundle.getMessage(WelcomeScreenTopComponent.class, "WelcomeScreenTopComponent.http.link")).toURL(); final long lastMod = getModified(startUrl); NbPreferences.forModule(getClass()).putLong("LAST_PAGE_UPDATE", lastMod); @@ -107,11 +108,11 @@ public void run() { if (lastMod != 0) jEditorPane1.setPage(startUrl); else - jEditorPane1.setPage(new URL(org.openide.util.NbBundle.getMessage(WelcomeScreenTopComponent.class, "WelcomeScreenTopComponent.local.link"))); + jEditorPane1.setPage(URI.create(org.openide.util.NbBundle.getMessage(WelcomeScreenTopComponent.class, "WelcomeScreenTopComponent.local.link")).toURL()); } catch (IOException ex) { logger.log(Level.INFO, "Loading welcome page from web failed", ex); try { - jEditorPane1.setPage(new URL(org.openide.util.NbBundle.getMessage(WelcomeScreenTopComponent.class, "WelcomeScreenTopComponent.local.link"))); + jEditorPane1.setPage(URI.create(org.openide.util.NbBundle.getMessage(WelcomeScreenTopComponent.class, "WelcomeScreenTopComponent.local.link")).toURL()); } catch (IOException ex1) { logger.log(Level.SEVERE, "Could not open local help page!", ex1); } @@ -138,7 +139,7 @@ public void run() { public static void checkOpen(long lastMod) { try { long lastCheck = NbPreferences.forModule(WelcomeScreenTopComponent.class).getLong("LAST_PAGE_UPDATE", 0); - URL startUrl = new URL(org.openide.util.NbBundle.getMessage(WelcomeScreenTopComponent.class, "WelcomeScreenTopComponent.http.link")); + URL startUrl = URI.create(org.openide.util.NbBundle.getMessage(WelcomeScreenTopComponent.class, "WelcomeScreenTopComponent.http.link")).toURL(); if (lastMod == 0) { lastMod = getModified(startUrl); } @@ -172,7 +173,7 @@ public void hyperlinkUpdate(HyperlinkEvent he) { logger.log(Level.INFO, "Loading page failed", ex); try { logger.log(Level.WARNING, "Could not open web page!"); - URL startUrl = new URL(org.openide.util.NbBundle.getMessage(WelcomeScreenTopComponent.class, "WelcomeScreenTopComponent.local.link")); + URL startUrl = URI.create(org.openide.util.NbBundle.getMessage(WelcomeScreenTopComponent.class, "WelcomeScreenTopComponent.local.link")).toURL(); jEditorPane1.setPage(startUrl); } catch (IOException ex1) { logger.log(Level.SEVERE, "Could not open local help page!", ex1); diff --git a/jme3-welcome-screen/src/com/jme3/gde/welcome/rss/RssFeedParser.java b/jme3-welcome-screen/src/com/jme3/gde/welcome/rss/RssFeedParser.java index d1209018f..70a49e3f7 100644 --- a/jme3-welcome-screen/src/com/jme3/gde/welcome/rss/RssFeedParser.java +++ b/jme3-welcome-screen/src/com/jme3/gde/welcome/rss/RssFeedParser.java @@ -6,6 +6,7 @@ */ import java.io.IOException; import java.io.InputStream; +import java.net.URI; import java.net.URL; import java.util.List; import javax.swing.text.BadLocationException; @@ -35,7 +36,7 @@ public class RssFeedParser { public RssFeedParser(String feedUrl) { try { - this.url = new URL(feedUrl); + this.url = URI.create(feedUrl).toURL(); ekit = new HTMLEditorKit(); doc = new HTMLDocument(); } catch (Exception e) { diff --git a/readme.md b/readme.md index b2515060f..582b2c460 100644 --- a/readme.md +++ b/readme.md @@ -27,7 +27,7 @@ Thus the prefered download is `jmonkeyplatform-windows-x64.exe` which essentiall After the SDK is up and running. A good starting point is to look at the jME examples. Under *File | New project | JME3 Tests* you can create a new project, populated with the jME build in examples. You can freely mess around with these and try out stuff. Your changes can always be reverted by simply creating a new *JME3 Tests* project. Once you are all comfortable and ready to embark on your own exciting journey, *File | New project | Basic game (with Gradle)* is the recommended starting point. ## Building the SDK -Building the SDK is an easy process basically, but it depends on what kind of distribution you want to build. Currently the SDK requires __JDK 17__ to build. +Building the SDK is an easy process basically, but it depends on what kind of distribution you want to build. Currently the SDK requires __JDK 21__ to build. You also have to know that the build process changes from time to time, so have a look at the `.github/workflows/gradle.yml` file, or related, you will see how we build our releases then. Technically the gradle task `buildSdk` is the main task which builds the sdk (Invoking `./gradlew buildSdk` or `gradlew.bat buildSdk` on Windows).