From 320783f2971d236723c21ed5a3348ab92e2b99f1 Mon Sep 17 00:00:00 2001
From: Aaron Helton <Aargonian@gmail.com>
Date: Sun, 23 Jul 2017 04:13:53 -0400
Subject: [PATCH] Added image resources to repo. Various extensive formatting
 fixes. Standardized on qualifying all local fields/methods with this.

---
 .idea/inspectionProfiles/Project_Default.xml  |  13 +++
 .idea/saveactions_settings.xml                |  19 +++++
 res/Grass.png                                 | Bin 0 -> 2015 bytes
 .../aargonian/editor/EditableTileSheet.java   |   2 +-
 src/com/aargonian/editor/EditorTool.java      |   2 +-
 src/com/aargonian/editor/GameFrame.java       |  15 ++--
 src/com/aargonian/editor/PencilTool.java      |   6 +-
 src/com/aargonian/editor/TileMapDisplay.java  |  49 +++++------
 src/com/aargonian/editor/TileSelectTool.java  |  14 ++--
 src/com/aargonian/editor/TilesetDisplay.java  |  38 ++++-----
 src/com/aargonian/resource/ImageResource.java |   6 +-
 .../aargonian/resource/ResourceLoader.java    |   2 +-
 src/com/aargonian/tile/TileImpl.java          |  55 ++++++-------
 src/com/aargonian/tile/TileMap.java           |  77 +++++++++---------
 14 files changed, 163 insertions(+), 135 deletions(-)
 create mode 100644 .idea/saveactions_settings.xml
 create mode 100644 res/Grass.png

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index ac875c4..35b9a1c 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,6 +1,19 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="DefaultFileTemplate" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="CHECK_FILE_HEADER" value="true" />
+      <option name="CHECK_TRY_CATCH_SECTION" value="true" />
+      <option name="CHECK_METHOD_BODY" value="true" />
+    </inspection_tool>
+    <inspection_tool class="InstanceofThis" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
+      <option name="processCode" value="true" />
+      <option name="processLiterals" value="true" />
+      <option name="processComments" value="true" />
+    </inspection_tool>
+    <inspection_tool class="UnqualifiedFieldAccess" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="UnqualifiedMethodAccess" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="WeakerAccess" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="SUGGEST_PACKAGE_LOCAL_FOR_MEMBERS" value="false" />
       <option name="SUGGEST_PACKAGE_LOCAL_FOR_TOP_CLASSES" value="false" />
diff --git a/.idea/saveactions_settings.xml b/.idea/saveactions_settings.xml
new file mode 100644
index 0000000..b1e9bca
--- /dev/null
+++ b/.idea/saveactions_settings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="SaveActionSettings">
+    <option name="actions">
+      <set>
+        <option value="activate" />
+        <option value="organizeImports" />
+        <option value="reformat" />
+        <option value="fieldCanBeFinal" />
+        <option value="explicitTypeCanBeDiamond" />
+        <option value="unqualifiedFieldAccess" />
+        <option value="suppressAnnotation" />
+        <option value="finalPrivateMethod" />
+        <option value="unnecessarySemicolon" />
+        <option value="missingOverrideAnnotation" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/res/Grass.png b/res/Grass.png
new file mode 100644
index 0000000000000000000000000000000000000000..11e49dc9f4ffa0c69b183c03a6ad3ff87bf4f843
GIT binary patch
literal 2015
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

literal 0
HcmV?d00001

diff --git a/src/com/aargonian/editor/EditableTileSheet.java b/src/com/aargonian/editor/EditableTileSheet.java
index 06317b6..e883de3 100644
--- a/src/com/aargonian/editor/EditableTileSheet.java
+++ b/src/com/aargonian/editor/EditableTileSheet.java
@@ -28,7 +28,7 @@ public class EditableTileSheet
      */
     public EditableTileSheet()
     {
-        tileImages = new ArrayList<Image>();
+        this.tileImages = new ArrayList<>();
     }
     
     public EditableTileSheet(List<Image> tileImages)
diff --git a/src/com/aargonian/editor/EditorTool.java b/src/com/aargonian/editor/EditorTool.java
index d643849..c00c33d 100644
--- a/src/com/aargonian/editor/EditorTool.java
+++ b/src/com/aargonian/editor/EditorTool.java
@@ -14,7 +14,7 @@ public class EditorTool implements MouseListener, MouseMotionListener, KeyListen
 {
     private final TileMapDisplay display;
     
-    public EditorTool(TileMapDisplay display)
+    protected EditorTool(TileMapDisplay display)
     {
         if(display == null)
         {
diff --git a/src/com/aargonian/editor/GameFrame.java b/src/com/aargonian/editor/GameFrame.java
index 1aec15a..4667a2f 100644
--- a/src/com/aargonian/editor/GameFrame.java
+++ b/src/com/aargonian/editor/GameFrame.java
@@ -13,18 +13,15 @@ import java.util.ArrayList;
  */
 public class GameFrame
 {
-    public static final String PROG_TITLE = "TileEditor 0.1.0";
+    private static final String PROG_TITLE = "TileEditor 0.1.0";
     
     public static void main(String[] args)
     {
-        EventQueue.invokeLater(() ->
-                               {
-                                   GameFrame.setupUI();
-                               });
+        EventQueue.invokeLater(GameFrame::setupUI);
     }
     
     //TODO: Add an Icon Image
-    private static final JFrame setupFrame()
+    private static JFrame setupFrame()
     {
         JFrame frame = new JFrame(PROG_TITLE);
         frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
@@ -47,18 +44,18 @@ public class GameFrame
      *
      * @return The Tile Pane Component, Fully Constructed
      */
-    private static final JComponent setupTilesPanel()
+    private static JComponent setupTilesPanel()
     {
         throw new UnsupportedOperationException("Not Supported Yet.");
     }
     
-    private static final void createTools(TileMapDisplay tileMapDisplay, TilesetDisplay tilesetDisplay)
+    private static void createTools(TileMapDisplay tileMapDisplay, TilesetDisplay tilesetDisplay)
     {
         PencilTool pencil = new PencilTool(tileMapDisplay, tilesetDisplay);
         tileMapDisplay.setCurrentActiveTool(pencil);
     }
     
-    public static final void setupUI()
+    private static void setupUI()
     {
         JFrame frame = setupFrame();
     
diff --git a/src/com/aargonian/editor/PencilTool.java b/src/com/aargonian/editor/PencilTool.java
index e35fee4..a26cfeb 100644
--- a/src/com/aargonian/editor/PencilTool.java
+++ b/src/com/aargonian/editor/PencilTool.java
@@ -31,9 +31,9 @@ public class PencilTool extends EditorTool implements TilesetDisplay.TilesetList
         {
             int tileX = e.getX() / super.getCurrentDisplay().getOptions().tileWidth();
             int tileY = e.getY() / super.getCurrentDisplay().getOptions().tileHeight();
-            getCurrentDisplay().getCurrentTileMap()
-                               .setTileResourceAt(TileImpl.PROPERTY_IMG, currentImage, tileX, tileY);
-            getCurrentDisplay().repaint();
+            this.getCurrentDisplay().getCurrentTileMap()
+                .setTileResourceAt(TileImpl.PROPERTY_IMG, this.currentImage, tileX, tileY);
+            this.getCurrentDisplay().repaint();
         }
     }
 }
diff --git a/src/com/aargonian/editor/TileMapDisplay.java b/src/com/aargonian/editor/TileMapDisplay.java
index 63ad0f0..95ee941 100644
--- a/src/com/aargonian/editor/TileMapDisplay.java
+++ b/src/com/aargonian/editor/TileMapDisplay.java
@@ -34,7 +34,7 @@ public class TileMapDisplay extends JComponent
     
     public OptionsBuilder getOptions()
     {
-        return options;
+        return this.options;
     }
     
     public TileMap getCurrentTileMap()
@@ -67,9 +67,9 @@ public class TileMapDisplay extends JComponent
     {
         if(this.currentActiveTool != null)
         {
-            this.removeMouseListener(currentActiveTool);
-            this.removeMouseMotionListener(currentActiveTool);
-            this.removeKeyListener(currentActiveTool);
+            this.removeMouseListener(this.currentActiveTool);
+            this.removeMouseMotionListener(this.currentActiveTool);
+            this.removeKeyListener(this.currentActiveTool);
         }
         
         this.currentActiveTool = tool;
@@ -82,25 +82,25 @@ public class TileMapDisplay extends JComponent
     public void paintComponent(Graphics g)
     {
         Graphics2D g2 = (Graphics2D) g;
-        g2.setColor(options.borderColor());
+        g2.setColor(this.options.borderColor());
         g2.fillRect(0, 0, this.getWidth(), this.getHeight());
-        for(int x = 0; x < tileMap.getColumns(); x++)
+        for(int x = 0; x < this.tileMap.getColumns(); x++)
         {
-            for(int y = 0; y < tileMap.getRows(); y++)
+            for(int y = 0; y < this.tileMap.getRows(); y++)
             {
-                final int tileXLoc = x * options.tileWidth();
-                final int tileYLoc = y * options.tileHeight();
+                final int tileXLoc = x * this.options.tileWidth();
+                final int tileYLoc = y * this.options.tileHeight();
     
-                ImageResource imgRes = (ImageResource) tileMap.getTileResourceAt(TileImpl.PROPERTY_IMG, x, y);
+                ImageResource imgRes = (ImageResource) this.tileMap.getTileResourceAt(TileImpl.PROPERTY_IMG, x, y);
                 Image img = imgRes == null ? null : imgRes.getImage();
                 if(img != null)
                 {
-                    g2.drawImage(img, tileXLoc, tileYLoc, options.tileWidth(), options.tileHeight(), null);
+                    g2.drawImage(img, tileXLoc, tileYLoc, this.options.tileWidth(), this.options.tileHeight(), null);
                 }
                 else
                 {
-                    final int HALF_WIDTH = options.tileWidth() / 2;
-                    final int HALF_HEIGHT = options.tileHeight() / 2;
+                    final int HALF_WIDTH = this.options.tileWidth() / 2;
+                    final int HALF_HEIGHT = this.options.tileHeight() / 2;
                     
                     g2.setColor(Color.lightGray);
                     g2.fillRect(tileXLoc, tileYLoc, HALF_WIDTH, HALF_HEIGHT);
@@ -110,17 +110,18 @@ public class TileMapDisplay extends JComponent
                     g2.fillRect(tileXLoc, tileYLoc + HALF_HEIGHT, HALF_WIDTH, HALF_HEIGHT);
                     g2.fillRect(tileXLoc + HALF_WIDTH, tileYLoc, HALF_WIDTH, HALF_HEIGHT);
                 }
-                
-                if(selectedTiles != null)
+    
+                if(this.selectedTiles != null)
                 {
-                    for(Pair<Integer, Integer> selectedTile : selectedTiles)
+                    for(Pair<Integer, Integer> selectedTile : this.selectedTiles)
                     {
                         if(selectedTile.getFirst() == x && selectedTile.getSecond() == y)
                         {
                             g2.setColor(Color.YELLOW);
-                            g2.fillRect(tileXLoc, tileYLoc, options.tileWidth(), options.tileHeight());
+                            g2.fillRect(tileXLoc, tileYLoc, this.options.tileWidth(), this.options.tileHeight());
                             g2.setColor(Color.YELLOW.brighter());
-                            g2.fillRect(tileXLoc + 2, tileYLoc + 2, options.tileWidth() - 2, options.tileHeight() - 2);
+                            g2.fillRect(tileXLoc + 2, tileYLoc + 2, this.options.tileWidth() - 2,
+                                        this.options.tileHeight() - 2);
                         }
                     }
                 }
@@ -185,32 +186,32 @@ public class TileMapDisplay extends JComponent
         
         public int tileWidth()
         {
-            return tileWidth;
+            return this.tileWidth;
         }
         
         public int tileHeight()
         {
-            return tileHeight;
+            return this.tileHeight;
         }
         
         public int displayWidth()
         {
-            return displayWidth;
+            return this.displayWidth;
         }
         
         public int displayHeight()
         {
-            return displayHeight;
+            return this.displayHeight;
         }
         
         public Color borderColor()
         {
-            return borderColor;
+            return this.borderColor;
         }
         
         public boolean fulllscreen()
         {
-            return fullscreen;
+            return this.fullscreen;
         }
     }
 }
diff --git a/src/com/aargonian/editor/TileSelectTool.java b/src/com/aargonian/editor/TileSelectTool.java
index dc606b5..96a3176 100644
--- a/src/com/aargonian/editor/TileSelectTool.java
+++ b/src/com/aargonian/editor/TileSelectTool.java
@@ -24,9 +24,9 @@ public class TileSelectTool extends EditorTool
         int tileX = e.getX() / super.getCurrentDisplay().getOptions().tileWidth();
         int tileY = e.getY() / super.getCurrentDisplay().getOptions().tileHeight();
         //getCurrentDisplay().setSelectedTiles(Arrays.asList(new Pair<Integer, Integer>(tileX, tileY)));
-        getCurrentDisplay().getCurrentTileMap()
-                           .setTileResourceAt(TileImpl.PROPERTY_IMG, new ImageResource("res/Water.png"), tileX, tileY);
-        getCurrentDisplay().repaint();
+        this.getCurrentDisplay().getCurrentTileMap()
+            .setTileResourceAt(TileImpl.PROPERTY_IMG, new ImageResource("res/Water.png"), tileX, tileY);
+        this.getCurrentDisplay().repaint();
     }
     
     @Override
@@ -34,11 +34,11 @@ public class TileSelectTool extends EditorTool
     {
         int tileX = e.getX() / super.getCurrentDisplay().getOptions().tileWidth();
         int tileY = e.getY() / super.getCurrentDisplay().getOptions().tileHeight();
-        
-        if(tileX != currentTileX || tileY != currentTileY)
+    
+        if(tileX != this.currentTileX || tileY != this.currentTileY)
         {
-            currentTileX = tileX;
-            currentTileY = tileY;
+            this.currentTileX = tileX;
+            this.currentTileY = tileY;
         }
     }
 }
diff --git a/src/com/aargonian/editor/TilesetDisplay.java b/src/com/aargonian/editor/TilesetDisplay.java
index 60ceb12..0f26ea0 100644
--- a/src/com/aargonian/editor/TilesetDisplay.java
+++ b/src/com/aargonian/editor/TilesetDisplay.java
@@ -52,34 +52,34 @@ public final class TilesetDisplay extends JComponent implements MouseListener
     
     private void setCurrentlySelectedImage(int index)
     {
-        currentlySelectedImage = index;
-        if(index < images.size() && index >= 0)
+        this.currentlySelectedImage = index;
+        if(index < this.images.size() && index >= 0)
         {
-            for(TilesetListener listener : listeners)
+            for(TilesetListener listener : this.listeners)
             {
-                listener.imageSelected(images.get(index));
+                listener.imageSelected(this.images.get(index));
             }
         }
     }
     
     public ImageResource getCurrentlySelectedImage(ImageResource res)
     {
-        if(currentlySelectedImage >= 0 && currentlySelectedImage < images.size())
+        if(this.currentlySelectedImage >= 0 && this.currentlySelectedImage < this.images.size())
         {
-            return images.get(currentlySelectedImage);
+            return this.images.get(this.currentlySelectedImage);
         }
         return null;
     }
     
     public void addImageToDisplay(ImageResource img)
     {
-        images.add(img);
+        this.images.add(img);
         this.repaint();
     }
     
     public void removeImageFromDisplay(ImageResource img)
     {
-        images.remove(img);
+        this.images.remove(img);
         this.repaint();
     }
     
@@ -87,13 +87,13 @@ public final class TilesetDisplay extends JComponent implements MouseListener
     @Override
     public void paintComponent(Graphics g)
     {
-        int columns = (int) (getWidth() / tileSize);
+        int columns = this.getWidth() / this.tileSize;
         if(columns != 0) // Avoid divide by zero and simply display nothing.
         {
-            for(int i = 0; i < images.size(); i++)
+            for(int i = 0; i < this.images.size(); i++)
             {
-                g.drawImage(images.get(i).getImage(), (i % columns) * tileSize, ((int) (i / columns)) * tileSize,
-                            tileSize, tileSize, null);
+                g.drawImage(this.images.get(i).getImage(), (i % columns) * this.tileSize, i / columns * this.tileSize,
+                            this.tileSize, this.tileSize, null);
             }
         }
     }
@@ -105,11 +105,11 @@ public final class TilesetDisplay extends JComponent implements MouseListener
         {
             return;
         }
-        
-        int columns = this.getWidth() / tileSize;
-        int tileX = e.getX() / tileSize;
-        int tileY = e.getY() / tileSize;
-        setCurrentlySelectedImage(tileY * columns + tileX);
+    
+        int columns = this.getWidth() / this.tileSize;
+        int tileX = e.getX() / this.tileSize;
+        int tileY = e.getY() / this.tileSize;
+        this.setCurrentlySelectedImage(tileY * columns + tileX);
     }
     
     @Override
@@ -136,8 +136,8 @@ public final class TilesetDisplay extends JComponent implements MouseListener
     
     }
     
-    public static interface TilesetListener
+    public interface TilesetListener
     {
-        public void imageSelected(ImageResource image);
+        void imageSelected(ImageResource image);
     }
 }
diff --git a/src/com/aargonian/resource/ImageResource.java b/src/com/aargonian/resource/ImageResource.java
index d232d3e..b71ec72 100644
--- a/src/com/aargonian/resource/ImageResource.java
+++ b/src/com/aargonian/resource/ImageResource.java
@@ -52,13 +52,13 @@ public class ImageResource extends Resource
     @Override
     public int hashCode()
     {
-        if(hash == 0 && this.res != null)
+        if(this.hash == 0 && this.res != null)
         {
             int[] data = new int[this.res.getWidth() * this.res.getHeight()];
             this.res.getRGB(0, 0, this.res.getWidth(), this.res.getHeight(), data, 0, 0);
-            hash = Arrays.hashCode(data);
+            this.hash = Arrays.hashCode(data);
         }
-        return hash;
+        return this.hash;
     }
     
     @Override
diff --git a/src/com/aargonian/resource/ResourceLoader.java b/src/com/aargonian/resource/ResourceLoader.java
index a517b01..160c0f8 100644
--- a/src/com/aargonian/resource/ResourceLoader.java
+++ b/src/com/aargonian/resource/ResourceLoader.java
@@ -13,7 +13,7 @@ public final class ResourceLoader
 {
     private static final Map<String, Resource> resourceCache = new HashMap<>(100);
     
-    public static final ImageResource loadImage(String imagePath)
+    public static ImageResource loadImage(String imagePath)
     {
         if(imagePath == null || imagePath.isEmpty())
         {
diff --git a/src/com/aargonian/tile/TileImpl.java b/src/com/aargonian/tile/TileImpl.java
index b914383..dd8cecd 100644
--- a/src/com/aargonian/tile/TileImpl.java
+++ b/src/com/aargonian/tile/TileImpl.java
@@ -57,94 +57,93 @@ public class TileImpl
         {
             return true;
         }
-        if(o == null || getClass() != o.getClass())
+        if(o == null || this.getClass() != o.getClass())
         {
             return false;
         }
         
         TileImpl tile = (TileImpl) o;
-        
-        if(properties != null ? !properties.equals(tile.properties) : tile.properties != null)
-        {
-            return false;
-        }
-        return resources != null ? resources.equals(tile.resources) : tile.resources == null;
+    
+        return (this.properties != null ? this.properties.equals(tile.properties) : tile.properties == null) &&
+               (this.resources != null ? this.resources.equals(tile.resources) : tile.resources == null);
     }
     
     @Override
     public int hashCode()
     {
-        if(hash == 0)
+        if(this.hash == 0)
         {
-            int result = properties != null ? properties.hashCode() : 0;
-            result = 31 * result + (resources != null ? resources.hashCode() : 0);
-            hash = result;
+            int result = this.properties != null ? this.properties.hashCode() : 0;
+            result = 31 * result + (this.resources != null ? this.resources.hashCode() : 0);
+            this.hash = result;
         }
-        return hash;
+        return this.hash;
     }
     
     public TileImpl removeProperty(String property)
     {
-        if(properties == null)
+        if(this.properties == null)
         {
             return this;
         }
-        return new TileImpl(properties.minus(property), resources);
+        return new TileImpl(this.properties.minus(property), this.resources);
     }
     
     public String getProperty(String property)
     {
-        if(properties == null)
+        if(this.properties == null)
         {
             return null;
         }
-        return properties.get(property);
+        return this.properties.get(property);
     }
     
     public TileImpl setProperty(String property, String value)
     {
-        if(properties == null)
+        if(this.properties == null)
         {
-            return new TileImpl(HashTreePMap.singleton(property, value), resources);
+            return new TileImpl(HashTreePMap.singleton(property, value), this.resources);
         }
-        return new TileImpl(properties.plus(property, value), resources);
+        return new TileImpl(this.properties.plus(property, value), this.resources);
     }
     
     public boolean hasProperty(String property)
     {
-        return properties != null && properties.containsKey(property) && properties.get(property) != null;
+        return this.properties != null && this.properties.containsKey(property) &&
+               this.properties.get(property) != null;
     }
     
     public TileImpl removeResource(String resource)
     {
-        if(resources == null)
+        if(this.resources == null)
         {
             return this;
         }
-        return new TileImpl(properties, resources.minus(resource));
+        return new TileImpl(this.properties, this.resources.minus(resource));
     }
     
     public Resource getResource(String resource)
     {
-        if(resources == null)
+        if(this.resources == null)
         {
             return null;
         }
-        return resources.get(resource);
+        return this.resources.get(resource);
     }
     
     public TileImpl setResource(String resourceKey, Resource resource)
     {
-        if(resources == null)
+        if(this.resources == null)
         {
-            return new TileImpl(properties, HashTreePMap.singleton(resourceKey, resource));
+            return new TileImpl(this.properties, HashTreePMap.singleton(resourceKey, resource));
         }
-        return new TileImpl(properties, resources.plus(resourceKey, resource));
+        return new TileImpl(this.properties, this.resources.plus(resourceKey, resource));
     }
     
     public boolean hasResource(String resourceKey)
     {
-        return resources != null && resources.containsKey(resourceKey) && resources.get(resourceKey) != null;
+        return this.resources != null && this.resources.containsKey(resourceKey) &&
+               this.resources.get(resourceKey) != null;
     }
     
 }
diff --git a/src/com/aargonian/tile/TileMap.java b/src/com/aargonian/tile/TileMap.java
index 0a67952..d0a6fca 100644
--- a/src/com/aargonian/tile/TileMap.java
+++ b/src/com/aargonian/tile/TileMap.java
@@ -11,112 +11,111 @@ public class TileMap
 {
     private final ArrayList<TileImpl> tilesImplementations;
     private final Tile[] tiles;
-    private int rows;
-    private int columns;
+    private final int rows;
+    private final int columns;
     
     public TileMap(int columns, int rows)
     {
         this.columns = columns;
         this.rows = rows;
-        tilesImplementations = new ArrayList<TileImpl>();
-        tilesImplementations.add(new TileImpl(null, null));
-        tilesImplementations.get(0).setProperty(TileImpl.PROPERTY_TILETYPE, "EmptyTile");
-        tiles = new Tile[columns * rows];
-        for(int i = 0; i < tiles.length; i++)
+        this.tilesImplementations = new ArrayList<>();
+        this.tilesImplementations.add(new TileImpl(null, null));
+        this.tilesImplementations.get(0).setProperty(TileImpl.PROPERTY_TILETYPE, "EmptyTile");
+        this.tiles = new Tile[columns * rows];
+        for(int i = 0; i < this.tiles.length; i++)
         {
-            tiles[i] = new Tile(tilesImplementations.get(0));
+            this.tiles[i] = new Tile(this.tilesImplementations.get(0));
         }
     }
     
     public void addTileImplementation(TileImpl impl)
     {
-        tilesImplementations.add(impl);
+        this.tilesImplementations.add(impl);
     }
     
     public ArrayList<TileImpl> getTileImplementations()
     {
-        return tilesImplementations;
+        return this.tilesImplementations;
     }
     
     public int getRows()
     {
-        return rows;
+        return this.rows;
     }
     
     public int getColumns()
     {
-        return columns;
+        return this.columns;
     }
     
-    private final void setTileImplementation(Tile tile, TileImpl newImpl)
+    private void setTileImplementation(Tile tile, TileImpl newImpl)
     {
-        for(TileImpl implementation : tilesImplementations)
+        for(TileImpl implementation : this.tilesImplementations)
         {
             if(implementation.hashCode() == newImpl.hashCode())
             {
                 if(implementation.equals(newImpl))
                 {
                     tile.setTileImplementation(implementation);
-                    newImpl = null;
                     return;
                 }
             }
         }
         //For loop found no duplicates. Add the new implementation to the list.
-        tilesImplementations.add(newImpl);
+        this.tilesImplementations.add(newImpl);
         tile.setTileImplementation(newImpl);
     }
     
-    private final boolean inBounds(int x, int y)
+    private boolean inBounds(int x, int y)
     {
-        return !(x < 0 || x >= columns || y < 0 || y >= rows);
+        return !(x < 0 || x >= this.columns || y < 0 || y >= this.rows);
     }
     
     public String getTilePropertyAt(String property, int x, int y)
     {
-        if(!inBounds(x, y))
+        if(this.inBounds(x, y))
         {
-            return null;
+            return this.tiles[(y * this.columns) + x].getTileImplementation().getProperty(property);
         }
-        return tiles[(y * columns) + x].getTileImplementation().getProperty(property);
+        return null;
     }
     
     public void setTilePropertyAt(String property, String value, int x, int y)
     {
-        if(!inBounds(x, y))
+        if(!this.inBounds(x, y))
         {
             return;
         }
-        Tile tile = tiles[(y * columns) + x];
+        Tile tile = this.tiles[(y * this.columns) + x];
         TileImpl newImpl = tile.getTileImplementation().setProperty(property, value);
-        setTileImplementation(tile, newImpl);
+        this.setTileImplementation(tile, newImpl);
     }
     
     public Resource getTileResourceAt(String resource, int x, int y)
     {
-        if(!inBounds(x, y))
+        if(!this.inBounds(x, y))
         {
             return null;
         }
-        return tiles[(y * columns) + x].getTileImplementation().getResource(resource);
+        return this.tiles[(y * this.columns) + x].getTileImplementation().getResource(resource);
     }
     
     public void setTileResourceAt(String resourceKey, Resource resource, int x, int y)
     {
-        if(!inBounds(x, y))
+        if(!this.inBounds(x, y))
         {
             return;
         }
-        Tile tile = tiles[(y * columns) + x];
+        Tile tile = this.tiles[(y * this.columns) + x];
         TileImpl newImpl = tile.getTileImplementation().setResource(resourceKey, resource);
-        setTileImplementation(tile, newImpl);
+        this.setTileImplementation(tile, newImpl);
     }
     
     private final class Tile
     {
         private TileImpl implementation;
-        
-        public Tile(TileImpl impl)
+    
+        private Tile(TileImpl impl)
         {
             this.implementation = impl;
         }
@@ -128,28 +127,28 @@ public class TileMap
             {
                 return true;
             }
-            if(o == null || getClass() != o.getClass())
+            if(o == null || this.getClass() != o.getClass())
             {
                 return false;
             }
             
             Tile tile = (Tile) o;
-            
-            return implementation.equals(tile.implementation);
+    
+            return this.implementation.equals(tile.implementation);
         }
         
         @Override
         public int hashCode()
         {
-            return implementation.hashCode();
+            return this.implementation.hashCode();
         }
-        
-        public TileImpl getTileImplementation()
+    
+        private TileImpl getTileImplementation()
         {
             return this.implementation;
         }
-        
-        public void setTileImplementation(TileImpl impl)
+    
+        private void setTileImplementation(TileImpl impl)
         {
             this.implementation = impl;
         }