Add some basic sanity checks around editing emitters.

gurkenlabs · Dec 14, 2021 · 73d9fa1 · 73d9fa1
1 parent 01da7e0
commit 73d9fa1
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/core/src/main/java/de/gurkenlabs/litiengine/graphics/emitters/particles/Particle.java b/core/src/main/java/de/gurkenlabs/litiengine/graphics/emitters/particles/Particle.java
@@ -17,6 +17,8 @@
 import java.util.function.Supplier;
 
 public abstract class Particle implements ITimeToLive {
+
+  private static final Color DEFAULT_COLOR = Color.BLACK;
   private long aliveTick;
   private long aliveTime;
   private float angle;
@@ -102,7 +104,7 @@ public Collision getCollisionType() {
   }
 
   public Color getColor() {
-    return this.color;
+    return this.color == null ? DEFAULT_COLOR : this.color;
   }
 
   public float getDeltaHeight() {

diff --git a/utiliti/src/main/java/de/gurkenlabs/utiliti/swing/panels/EmitterColorPanel.java b/utiliti/src/main/java/de/gurkenlabs/utiliti/swing/panels/EmitterColorPanel.java
@@ -128,16 +128,28 @@ protected LayoutManager createLayout() {
 
   private void setupChangedListeners() {
     btnAdd.addActionListener(
-        a -> model.addRow(new Object[] {ColorHelper.encode(EmitterData.DEFAULT_COLOR.brighter())}));
+        a -> model.addRow(new Object[]{ColorHelper.encode(EmitterData.DEFAULT_COLOR.brighter())}));
     btnRemove.addActionListener(a -> model.removeRow(table.getSelectedRow()));
     btnEdit.addActionListener(
         a -> {
-          Color previousColor =
-              ColorHelper.decode(
-                  table.getValueAt(table.getSelectedRow(), table.getSelectedColumn()).toString());
+          if (table.getSelectedRow() == -1 || table.getSelectedColumn() == -1) {
+            // setting a color requires a cell selection
+            return;
+          }
+
+          Color previousColor = null;
+          Object value = table.getValueAt(table.getSelectedRow(), table.getSelectedColumn());
+          if (value != null) {
+            previousColor = ColorHelper.decode(value.toString());
+          }
+
           final Color result =
               JColorChooser.showDialog(
                   null, Resources.strings().get("particle_editcolor"), previousColor);
+          if (result == null) {
+            return;
+          }
+
           table.setValueAt(
               ColorHelper.encode(result), table.getSelectedRow(), table.getSelectedColumn());
         });