From e5f7fdcf4f9f0e0d5175e612a466706d58accc0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konrad=20K=C3=BCgler?= Date: Sun, 27 Apr 2014 20:35:14 +0200 Subject: [PATCH] PlotLane: Use identity hashCode and equals MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Using the lane position and other data for equals/hashCode is not useful. Change-Id: I7af151d8a84544a77a486474c8ac71dd80090c66 Signed-off-by: Konrad Kügler --- .../src/org/eclipse/jgit/awtui/SwingCommitList.java | 9 --------- .../src/org/eclipse/jgit/revplot/PlotCommitList.java | 1 - .../src/org/eclipse/jgit/revplot/PlotLane.java | 8 -------- 3 files changed, 18 deletions(-) diff --git a/org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/SwingCommitList.java b/org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/SwingCommitList.java index d8660e5ed..4a1196447 100644 --- a/org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/SwingCommitList.java +++ b/org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/SwingCommitList.java @@ -83,14 +83,5 @@ protected void recycleLane(final SwingLane lane) { static class SwingLane extends PlotLane { Color color; - @Override - public boolean equals(Object o) { - return super.equals(o) && color.equals(((SwingLane)o).color); - } - - @Override - public int hashCode() { - return super.hashCode() ^ color.hashCode(); - } } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommitList.java b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommitList.java index 943ec4ec3..9175e14f2 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommitList.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommitList.java @@ -236,7 +236,6 @@ private void handleBlockedLanes(final int index, if (newPos == -1) newPos = positionsAllocated++; freePositions.add(Integer.valueOf(commit.lane.getPosition())); - activeLanes.remove(commit.lane); commit.lane.position = newPos; activeLanes.add(commit.lane); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotLane.java b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotLane.java index fe67ac993..866a0f943 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotLane.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotLane.java @@ -63,12 +63,4 @@ public class PlotLane implements Serializable { public int getPosition() { return position; } - - public int hashCode() { - return position; - } - - public boolean equals(final Object o) { - return o == this; - } }