[Gridarta-commit] SF.net SVN: gridarta:[9716] streams/tilestretching/src/crossfire/src/main/ java/net/sf/gridarta/var/crossfire/gui/map/renderer/AbstractFlatMapRenderer .java

[<aki...@us...>]

Revision: 9716
          http://sourceforge.net/p/gridarta/code/9716
Author:   akirschbaum
Date:     2014-11-29 12:12:28 +0000 (Sat, 29 Nov 2014)
Log Message:
-----------
Simplify code.

Modified Paths:
--------------
    streams/tilestretching/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/gui/map/renderer/AbstractFlatMapRenderer.java

Modified: streams/tilestretching/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/gui/map/renderer/AbstractFlatMapRenderer.java
===================================================================
--- streams/tilestretching/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/gui/map/renderer/AbstractFlatMapRenderer.java	2014-11-28 19:32:57 UTC (rev 9715)
+++ streams/tilestretching/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/gui/map/renderer/AbstractFlatMapRenderer.java	2014-11-29 12:12:28 UTC (rev 9716)
@@ -489,27 +489,24 @@
     @Nullable
     @Override
     public Point getSquareLocationAt(@NotNull final Point point, @Nullable final Point retPoint) {
-        final int mapWidth = mapSize.getWidth();
-        final int mapHeight = mapSize.getHeight();
-        final int xm;
-        final int ym;
-        if (point.x >= borderOffset.x && point.x < mapWidth * IGUIConstants.SQUARE_WIDTH + borderOffset.x && point.y >= borderOffset.y && point.y < mapHeight * IGUIConstants.SQUARE_HEIGHT + borderOffset.y) {
-            xm = (point.x - borderOffset.x) / IGUIConstants.SQUARE_WIDTH;
-            ym = (point.y - borderOffset.y) / IGUIConstants.SQUARE_HEIGHT;
-        } else {
-            xm = -1;
-            ym = -1;
+        final int x = point.x - borderOffset.x;
+        final int y = point.y - borderOffset.y;
+        if (x < 0 || y < 0) {
+            return null;
         }
-
-        if (xm < 0 || xm >= mapWidth || ym < 0 || ym >= mapHeight) {
+        final int xm = x / IGUIConstants.SQUARE_WIDTH;
+        final int ym = y / IGUIConstants.SQUARE_HEIGHT;
+        if (xm >= mapSize.getWidth() || ym >= mapSize.getHeight()) {
             return null;
         }
-        if (retPoint != null) {
-            retPoint.setLocation(xm, ym);
-            return retPoint;
+
+        if (retPoint == null) {
+            return new Point(xm, ym);
         }
 
-        return new Point(xm, ym);
+        retPoint.setLocation(xm, ym);
+        return retPoint;
+
     }
 
     /**

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.