Fix FindBugs and Eclipse warnings in org.eclipse.jgit.ui

Change-Id: Ie6b3ff7d470cc9b7044fd6288cbf86dcc58220eb

diff --git a/org.eclipse.jgit.ui/build.properties b/org.eclipse.jgit.ui/build.properties
index aa1a0082691202e9c8cc650976d2b2d128cae35b..84f1c95cfa94470bc5d00e43bb6b9681a3d431e2 100644 (file)
--- a/org.eclipse.jgit.ui/build.properties
+++ b/org.eclipse.jgit.ui/build.properties
@@ -1,4 +1,5 @@
-source.. = src/
+source.. = src/,\
+           resources/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\

diff --git a/org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/AWTPlotRenderer.java b/org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/AWTPlotRenderer.java
index 4a5d4603ca5984da465921abe38c3eb40491c661..e699a72cfaf5166aa8b0c87881dad791ac88bcdc 100644 (file)
--- a/org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/AWTPlotRenderer.java
+++ b/org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/AWTPlotRenderer.java
@@ -49,6 +49,7 @@ import java.awt.Color;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.Polygon;
+import java.io.Serializable;
 
 import org.eclipse.jgit.awtui.CommitGraphPane.GraphCellRender;
 import org.eclipse.jgit.awtui.SwingCommitList.SwingLane;
@@ -57,11 +58,13 @@ import org.eclipse.jgit.lib.Ref;
 import org.eclipse.jgit.revplot.AbstractPlotRenderer;
 import org.eclipse.jgit.revplot.PlotCommit;
 
-final class AWTPlotRenderer extends AbstractPlotRenderer<SwingLane, Color> {
+final class AWTPlotRenderer extends AbstractPlotRenderer<SwingLane, Color>
+               implements Serializable {
+       private static final long serialVersionUID = 1L;
 
        final GraphCellRender cell;
 
-       Graphics2D g;
+       transient Graphics2D g;
 
        AWTPlotRenderer(final GraphCellRender c) {
                cell = c;

diff --git a/org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/CommitGraphPane.java b/org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/CommitGraphPane.java
index 13d408f19f442fc47df49af487e751321553d4b5..9c9d1f4a5c0b94a21b01db4cca13d755e73431a9 100644 (file)
--- a/org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/CommitGraphPane.java
+++ b/org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/CommitGraphPane.java
@@ -222,6 +222,7 @@ public class CommitGraphPane extends JTable {
 
                PlotCommit<SwingLane> commit;
 
+               @SuppressWarnings("unchecked")
                public Component getTableCellRendererComponent(final JTable table,
                                final Object value, final boolean isSelected,
                                final boolean hasFocus, final int row, final int column) {

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 b58547a9e139c3c45f3ea62783795f7cd4a3c8e3..d8660e5ed62d5b039c720b856fe648773c22d5fc 100644 (file)
--- a/org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/SwingCommitList.java
+++ b/org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/SwingCommitList.java
@@ -87,5 +87,10 @@ class SwingCommitList extends PlotCommitList<SwingCommitList.SwingLane> {
                public boolean equals(Object o) {
                        return super.equals(o) && color.equals(((SwingLane)o).color);
                }
+
+               @Override
+               public int hashCode() {
+                       return super.hashCode() ^ color.hashCode();
+               }
        }
 }