mirrors
/
freecol
mirror of https://github.com/FreeCol/freecol.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Correct bad merge of CanvasMouseListener.java so that original remains, not one utilizing .equals or Equals()

This commit is contained in:
calebrw 2016-09-22 10:18:21 -05:00
parent 8e9a0e9439
commit 631ff19f8b
1 changed files with 41 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/net/sf/freecol/client/gui/CanvasMouseListener.java
View File

@ -23,7 +23,6 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.util.Objects;
import java.util.logging.Level;
import java.util.logging.Logger;
@ -182,7 +181,6 @@ public final class CanvasMouseListener extends FreeColClientHolder
break;
case MouseEvent.BUTTON2:
immediateGoto(tile);
if (unit != null && !Objects.equals(unit.getTile(), tile)) {
break;
case MouseEvent.BUTTON3:
immediatePopup(tile, e.getX(), e.getY());
@ -219,7 +217,7 @@ public final class CanvasMouseListener extends FreeColClientHolder
// Clear goto order when active unit is on the tile, else
// try to display a settlement.
Unit unit = canvas.getActiveUnit();
if(unit != null && Objects.equals(unit.getTile(), tile)) {
if (unit != null && unit.getTile() == tile) {
igc().clearGotoOrders(unit);
canvas.updateCurrentPathForActiveUnit();
} else {