Unnecessary boxing and switch

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

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

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

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

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

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

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

@@ -274,12 +274,12 @@ public class ProjectAssetManager extends DesktopAssetManager {
     private PropertyChangeListener classPathListener = new PropertyChangeListener() {
         public void propertyChange(PropertyChangeEvent evt) {
             logger.log(Level.FINE, "Classpath event: {0}", evt);
-            if (ClassPath.PROP_ROOTS.equals(evt.getPropertyName())) {
-                updateClassLoader();
-            } else if (ClassPath.PROP_ENTRIES.equals(evt.getPropertyName())) {
-                updateClassLoader();
-            } else if (ClassPath.PROP_INCLUDES.equals(evt.getPropertyName())) {
-                updateClassLoader();
+            if (null != evt.getPropertyName()) switch (evt.getPropertyName()) {
+                case ClassPath.PROP_ROOTS -> updateClassLoader();
+                case ClassPath.PROP_ENTRIES -> updateClassLoader();
+                case ClassPath.PROP_INCLUDES -> updateClassLoader();
+                default -> {
+                }
             }
         }
     };

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -605,17 +605,19 @@ public final class MatDefEditorlElement extends JPanel implements
 
     private ConnectionEndpoint findConnectPoint(String nameSpace, String name, boolean isInput) {
 
-        if (nameSpace.equals("MatParam")
-                || nameSpace.equals("WorldParam")
-                || nameSpace.equals("Attr")) {
-            NodePanel np = diagram1.getNodePanel(nameSpace + "." + name);
-            return isInput ? np.getInputConnectPoint(name) : np.getOutputConnectPoint(name);
-        } else if (nameSpace.equals("Global")) {
-            ShaderOutBusPanel outBus = diagram1.getOutBusPanel(name);
-            return outBus.getConnectPoint();
-        } else {
-            NodePanel np = diagram1.getNodePanel(diagram1.getCurrentTechniqueName() + "/" + nameSpace);
-            return isInput ? np.getInputConnectPoint(name) : np.getOutputConnectPoint(name);
+        switch (nameSpace) {
+            case "MatParam", "WorldParam", "Attr" -> {
+                NodePanel np = diagram1.getNodePanel(nameSpace + "." + name);
+                return isInput ? np.getInputConnectPoint(name) : np.getOutputConnectPoint(name);
+            }
+            case "Global" -> {
+                ShaderOutBusPanel outBus = diagram1.getOutBusPanel(name);
+                return outBus.getConnectPoint();
+            }
+            default -> {
+                NodePanel np = diagram1.getNodePanel(diagram1.getCurrentTechniqueName() + "/" + nameSpace);
+                return isInput ? np.getInputConnectPoint(name) : np.getOutputConnectPoint(name);
+            }
         }
     }
 

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

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

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

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

jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerToolController.java

@@ -386,12 +386,12 @@ public class SceneComposerToolController extends SceneToolController {
 
     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 -> {
+                }
             }
         }
     }

jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneEditTool.java

@@ -375,12 +375,18 @@ public abstract class SceneEditTool {
 
         if (pickType != 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;
+                if (null != collisionName) 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) {

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

@@ -1032,17 +1032,21 @@ public final class TerrainEditorTopComponent extends TopComponent implements Sce
 
         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)) {
             }
         }