Browse Source

Fixes #234 Don't crash when negative numbers are entered into the shortcut manager

MeFisto94 5 years ago
parent
commit
e9d4b2a8bd

+ 37 - 7
jme3-scenecomposer/src/com/jme3/gde/scenecomposer/tools/shortcuts/ShortcutManager.java

@@ -1,7 +1,33 @@
 /*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+ * Copyright (c) 2009-2020 jMonkeyEngine
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'jMonkeyEngine' nor the names of its contributors
+ *   may be used to endorse or promote products derived from this software
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.jme3.gde.scenecomposer.tools.shortcuts;
 
@@ -12,7 +38,7 @@ import java.util.ArrayList;
 import org.openide.util.lookup.ServiceProvider;
 
 /**
- *
+ * The Class providing hotkeys to move, rotate and scale, much like in blender.
  * @author dokthar
  */
 @ServiceProvider(service = ShortcutManager.class)
@@ -25,7 +51,7 @@ public class ShortcutManager {
     private boolean altDown = false;
 
     public ShortcutManager() {
-        shortcutList = new ArrayList<ShortcutTool>();
+        shortcutList = new ArrayList<>();
         shortcutList.add(new MoveShortcut());
         shortcutList.add(new RotateShortcut());
         shortcutList.add(new ScaleShortcut());
@@ -317,9 +343,13 @@ public class ShortcutManager {
      */
     public static float getNumberKey(StringBuilder numberBuilder) {
         if (numberBuilder.length() == 0) {
-            return 0;
+            return 0f;
         } else {
-            return Float.parseFloat(numberBuilder.toString());
+            try {
+                return Float.parseFloat(numberBuilder.toString());
+            } catch (NumberFormatException nfe) {
+                return 0f; // Don't crash on invalid input
+            }
         }
     }