diff options
| author | Shawn Pearce <spearce@spearce.org> | 2010-06-14 19:59:48 -0400 |
|---|---|---|
| committer | Code Review <codereview-daemon@eclipse.org> | 2010-06-14 19:59:48 -0400 |
| commit | 86fcdc53ad29d850f0831636038ef56a981c98e5 (patch) | |
| tree | bc96b3498ca16def7da9b8470799f0e9b61fad29 /org.eclipse.jgit.ui | |
| parent | 44ba1bc78ce0c00fd970f39a93128de061e83e01 (diff) | |
| parent | 6d5241110bc22f69287dc285a6793301075bb3dc (diff) | |
| download | jgit-86fcdc53ad29d850f0831636038ef56a981c98e5.tar.gz jgit-86fcdc53ad29d850f0831636038ef56a981c98e5.zip | |
Merge changes I53f71dc0,I3a899a3a,I3e8bd245,Ie7c9db83,If396326e,I6f4cf8da,I3bf96dd0,I3a2a43a1,I292fe88c,Ia1cf40cf
* changes:
git-servlet: Fix comparing uploadFactory with the wrong DISABLED instance
Prefer static inner classes
Override equals for SwingLane since super class PlotLane defines it
Make sure a Stream is closed upon errors in IpLogGenerator
Make constant static in RebuildCommitGraph
Make inner classes static in http code
Cache filemode in GitIndex
Remove unused parent field in PlotLane
Removed unused repo field in WorkDirCheckout
Extend DiffFormatter API to simplify styling
Diffstat (limited to 'org.eclipse.jgit.ui')
| -rw-r--r-- | org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/CommitGraphPane.java | 6 | ||||
| -rw-r--r-- | org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/SwingCommitList.java | 4 |
2 files changed, 7 insertions, 3 deletions
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 effe6e5756..13d408f19f 100644 --- a/org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/CommitGraphPane.java +++ b/org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/CommitGraphPane.java @@ -176,7 +176,7 @@ public class CommitGraphPane extends JTable { } } - class NameCellRender extends DefaultTableCellRenderer { + static class NameCellRender extends DefaultTableCellRenderer { private static final long serialVersionUID = 1L; public Component getTableCellRendererComponent(final JTable table, @@ -194,7 +194,7 @@ public class CommitGraphPane extends JTable { } } - class DateCellRender extends DefaultTableCellRenderer { + static class DateCellRender extends DefaultTableCellRenderer { private static final long serialVersionUID = 1L; private final DateFormat fmt = new SimpleDateFormat( @@ -215,7 +215,7 @@ public class CommitGraphPane extends JTable { } } - class GraphCellRender extends DefaultTableCellRenderer { + static class GraphCellRender extends DefaultTableCellRenderer { private static final long serialVersionUID = 1L; private final AWTPlotRenderer renderer = new AWTPlotRenderer(this); 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 4a11964473..b58547a9e1 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,5 +83,9 @@ class SwingCommitList extends PlotCommitList<SwingCommitList.SwingLane> { static class SwingLane extends PlotLane { Color color; + @Override + public boolean equals(Object o) { + return super.equals(o) && color.equals(((SwingLane)o).color); + } } } |