Signed-off-by: Roger C. Soares <rogersoares@intelinet.com.br> --- .../egit/core/internal/mapping/GitFileHistory.java | 1 - .../src/org/spearce/jgit/lib/GitIndex.java | 2 +- .../org/spearce/jgit/lib/TopologicalWalker.java | 2 +- .../src/org/spearce/jgit/lib/WorkDirCheckout.java | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-)
Show changes to 4 files +3 −4
org.spearce.egit.core/src/org/spearce/egit/core/internal/mapping/GitFileHistory.java, org.spearce.jgit/src/org/spearce/jgit/lib/GitIndex.java, org.spearce.jgit/src/org/spearce/jgit/lib/TopologicalWalker.java, org.spearce.jgit/src/org/spearce/jgit/lib/WorkDirCheckout.java
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/internal/mapping/GitFileHistory.java b/org.spearce.egit.core/src/org/spearce/egit/core/internal/mapping/GitFileHistory.java index 9e683a5..adf422d 100644 --- a/org.spearce.egit.core/src/org/spearce/egit/core/internal/mapping/GitFileHistory.java +++ b/org.spearce.egit.core/src/org/spearce/egit/core/internal/mapping/GitFileHistory.java @@ -232,7 +232,6 @@ public class GitFileHistory extends FileHistory implements IAdaptable { } else activeDiffLeafId = ObjectId.zeroId(); - ; } Collection<IFileRevision> githistory; diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/GitIndex.java b/org.spearce.jgit/src/org/spearce/jgit/lib/GitIndex.java index bdcb71a..1fbd7f7 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/lib/GitIndex.java +++ b/org.spearce.jgit/src/org/spearce/jgit/lib/GitIndex.java @@ -653,7 +653,7 @@ public class GitIndex { if (updateNeeded) flags |= 0x4000; else - flags &= ~0x4000;; + flags &= ~0x4000; } } diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/TopologicalWalker.java b/org.spearce.jgit/src/org/spearce/jgit/lib/TopologicalWalker.java index 16af0c6..0e937cb 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/lib/TopologicalWalker.java +++ b/org.spearce.jgit/src/org/spearce/jgit/lib/TopologicalWalker.java @@ -54,7 +54,7 @@ public class TopologicalWalker extends Walker { super(repostory, starts, relativeResourceName, leafIsBlob, followMainOnly, merges, activeDiffLeafId); this.returnAll = returnAll; - topoSorter = new TopologicalSorter<ObjectId>() {; + topoSorter = new TopologicalSorter<ObjectId>() { @Override protected boolean filter(ObjectId element) { return returnAll ? true : collected.containsKey(element); diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/WorkDirCheckout.java b/org.spearce.jgit/src/org/spearce/jgit/lib/WorkDirCheckout.java index 6159469..3dde864 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/lib/WorkDirCheckout.java +++ b/org.spearce.jgit/src/org/spearce/jgit/lib/WorkDirCheckout.java @@ -124,7 +124,7 @@ public class WorkDirCheckout { } } - ArrayList<String> conflicts = new ArrayList<String>();; + ArrayList<String> conflicts = new ArrayList<String>(); ArrayList<String> removed = new ArrayList<String>(); protected Tree head = null;
-- 1.5.3.7
