Bugfixing, removed some memory leaks, other minor UI improvements

Author: swordmaster2k

core/src/main/java/org/rpgwizard/common/assets/Animation.java

@@ -9,6 +9,7 @@
 
 import java.awt.image.BufferedImage;
 import java.util.Iterator;
+import java.util.Objects;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import org.rpgwizard.common.assets.events.AnimationChangedEvent;
 import org.rpgwizard.common.assets.listeners.AnimationChangeListener;
@@ -198,6 +199,28 @@ public void fireAnimationFrameRemoved() {
         }
     }
 
+    @Override
+    public int hashCode() {
+        int hash = 7;
+        hash = 29 * hash + Objects.hashCode(this.spriteSheet);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final Animation other = (Animation) obj;
+        return this.spriteSheet.getFileName().equals(other.spriteSheet.getFileName());
+    }
+
     private void init() {
         animationWidth = 50;
         animationHeight = 50;

core/src/main/java/org/rpgwizard/common/assets/board/BoardLayer.java

@@ -248,8 +248,12 @@ public Tile getTileAt(int x, int y) {
      *            the tile
      */
     public void setTileAt(int x, int y, Tile tile) {
-        tiles[x][y] = tile;
-        board.fireBoardChanged();
+        if (x >= 0 && x < tiles.length) {
+            if (y >= 0 && y < tiles[x].length) {
+                tiles[x][y] = tile;
+                board.fireBoardChanged();
+            }
+        }
     }
 
     /**

editor/editor-ui/src/main/java/org/rpgwizard/editor/MainWindow.java

@@ -431,12 +431,10 @@ public void internalFrameClosed(InternalFrameEvent e) {
 
     @Override
     public void internalFrameIconified(InternalFrameEvent e) {
-
     }
 
     @Override
     public void internalFrameDeiconified(InternalFrameEvent e) {
-
     }
 
     @Override

editor/editor-ui/src/main/java/org/rpgwizard/editor/editors/AnimationEditor.java

@@ -16,6 +16,8 @@
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
+import javax.swing.event.InternalFrameEvent;
+import javax.swing.event.InternalFrameListener;
 import org.rpgwizard.common.assets.AbstractAsset;
 import org.rpgwizard.common.assets.Animation;
 import org.rpgwizard.common.assets.AssetDescriptor;
@@ -33,7 +35,8 @@
  * @author Geoff Wilson
  * @author Joshua Michael Daly
  */
-public final class AnimationEditor extends AbstractAssetEditorWindow implements AnimationChangeListener {
+public final class AnimationEditor extends AbstractAssetEditorWindow
+        implements InternalFrameListener, AnimationChangeListener {
 
     private final Animation animation;
 
@@ -78,7 +81,9 @@ public void saveAs(File file) throws Exception {
         save();
     }
 
-    public void gracefulClose() {
+    @Override
+    public void internalFrameClosed(InternalFrameEvent e) {
+        animatedPanel.tearDown();
         animation.removeAnimationChangeListener(this);
     }
 

editor/editor-ui/src/main/java/org/rpgwizard/editor/editors/CharacterEditor.java

@@ -14,7 +14,6 @@
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JTextField;
-import javax.swing.event.InternalFrameListener;
 import org.rpgwizard.common.assets.AbstractAsset;
 import org.rpgwizard.common.assets.AssetDescriptor;
 import org.rpgwizard.common.assets.GraphicEnum;
@@ -33,7 +32,7 @@
  * @author Joel Moore
  * @author Joshua Michael Daly
  */
-public final class CharacterEditor extends AbstractSpriteEditor implements InternalFrameListener, SpriteChangeListener {
+public final class CharacterEditor extends AbstractSpriteEditor implements SpriteChangeListener {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CharacterEditor.class);
 
@@ -126,11 +125,8 @@ private void setupNewPlayer() {
      * Builds the Swing interface
      */
     private void constructWindow() {
-        addInternalFrameListener(this);
-
         createStatsPanel();
         createAnimationsPanel();
-
         build();
     }
 

editor/editor-ui/src/main/java/org/rpgwizard/editor/editors/EnemyEditor.java

@@ -30,7 +30,7 @@
  * @author Joel Moore
  * @author Joshua Michael Daly
  */
-public final class EnemyEditor extends AbstractSpriteEditor implements InternalFrameListener, SpriteChangeListener {
+public final class EnemyEditor extends AbstractSpriteEditor implements SpriteChangeListener {
 
     private final Enemy enemy;
 
@@ -119,11 +119,8 @@ private void setupNewEnemy() {
      * Builds the Swing interface
      */
     private void constructWindow() {
-        this.addInternalFrameListener(this);
-
-        this.createStatsPanel();
-        this.createGraphicsPanel();
-
+        createStatsPanel();
+        createGraphicsPanel();
         build();
     }
 

editor/editor-ui/src/main/java/org/rpgwizard/editor/editors/NPCEditor.java

@@ -14,7 +14,6 @@
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JTextField;
-import javax.swing.event.InternalFrameListener;
 import org.rpgwizard.common.assets.AbstractAsset;
 import org.rpgwizard.common.assets.AssetDescriptor;
 import org.rpgwizard.common.assets.GraphicEnum;
@@ -27,7 +26,7 @@
  *
  * @author Joshua Michael Daly
  */
-public final class NPCEditor extends AbstractSpriteEditor implements InternalFrameListener, SpriteChangeListener {
+public final class NPCEditor extends AbstractSpriteEditor implements SpriteChangeListener {
 
     private final NPC npc;
 
@@ -83,11 +82,8 @@ private void setupNewNPC() {
     }
 
     private void constructWindow() {
-        addInternalFrameListener(this);
-
         createStatsPanel();
         createAnimationsPanel();
-
         build();
     }
 

editor/editor-ui/src/main/java/org/rpgwizard/editor/editors/ProjectEditor.java

@@ -129,51 +129,16 @@ public void saveAs(File file) throws Exception {
         save();
     }
 
-    public void gracefulClose() {
-
-    }
-
-    @Override
-    public void internalFrameOpened(InternalFrameEvent e) {
-
-    }
-
-    @Override
-    public void internalFrameClosing(InternalFrameEvent e) {
-
-    }
-
     @Override
     public void internalFrameClosed(InternalFrameEvent e) {
-        this.gracefulClose();
-    }
-
-    @Override
-    public void internalFrameIconified(InternalFrameEvent e) {
-
-    }
-
-    @Override
-    public void internalFrameDeiconified(InternalFrameEvent e) {
-
-    }
-
-    @Override
-    public void internalFrameActivated(InternalFrameEvent e) {
-
-    }
-
-    @Override
-    public void internalFrameDeactivated(InternalFrameEvent e) {
 
     }
 
     /**
      * Builds the Swing interface
      */
     private void constructWindow() {
-        this.addInternalFrameListener(this);
-
+        addInternalFrameListener(this);
         // Builds the components needed to display the Project status.
         JTabbedPane tabPane = new JTabbedPane();