Replace deprecated ObjectReader.release()
Where possible use try-with-resources statements instead.
Change-Id: Ica07a4957d48e9e452882795d9cfd828e2457854
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/blame/BlameRevision.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/blame/BlameRevision.java
index 10d802d..4c7fef8 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/blame/BlameRevision.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/blame/BlameRevision.java
@@ -200,8 +200,7 @@
}
private Diff calculateDiffToParent(RevCommit parentCommit) {
- ObjectReader reader = repository.newObjectReader();
- try {
+ try (ObjectReader reader = repository.newObjectReader()) {
DiffEntry diffEntry = CompareCoreUtils.getChangeDiffEntry(
repository, sourcePath, commit, parentCommit, reader);
if (diffEntry == null)
@@ -222,8 +221,6 @@
return new Diff(diffEntry.getOldPath(), oldText, newText, editList);
} catch (IOException e) {
return null;
- } finally {
- reader.release();
}
}
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/RefContentProposal.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/RefContentProposal.java
index 712a780..11ecf06 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/RefContentProposal.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/RefContentProposal.java
@@ -119,8 +119,7 @@
public String getDescription() {
if (objectId == null)
return null;
- ObjectReader reader = db.newObjectReader();
- try {
+ try (ObjectReader reader = db.newObjectReader()) {
final ObjectLoader loader = reader.open(objectId);
final StringBuilder sb = new StringBuilder();
sb.append(refName);
@@ -154,8 +153,6 @@
Activator.logError(NLS.bind(
UIText.RefContentProposal_errorReadingObject, objectId), e);
return null;
- } finally {
- reader.release();
}
}
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchResultTable.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchResultTable.java
index c6f6bdb..b050ff8 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchResultTable.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchResultTable.java
@@ -330,7 +330,7 @@
treePanel.addDisposeListener(new DisposeListener() {
public void widgetDisposed(DisposeEvent e) {
if (reader != null)
- reader.release();
+ reader.close();
}
});
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FileDiff.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FileDiff.java
index 668a918..648d647 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FileDiff.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FileDiff.java
@@ -230,11 +230,8 @@
return;
}
- ObjectReader reader = db.newObjectReader();
- try {
+ try (ObjectReader reader = db.newObjectReader()) {
outputEclipseDiff(d, db, reader, diffFmt);
- } finally {
- reader.release();
}
}
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/merge/MergeResultDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/merge/MergeResultDialog.java
index 9a79b73..3b23290 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/merge/MergeResultDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/merge/MergeResultDialog.java
@@ -335,7 +335,7 @@
newShell.addDisposeListener(new DisposeListener() {
public void widgetDisposed(DisposeEvent e) {
if (objectReader != null)
- objectReader.release();
+ objectReader.close();
}
});
}
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushResultTable.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushResultTable.java
index 9dbb97d..6a289e1 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushResultTable.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushResultTable.java
@@ -91,7 +91,7 @@
root.addDisposeListener(new DisposeListener() {
public void widgetDisposed(DisposeEvent e) {
if (reader != null)
- reader.release();
+ reader.close();
}
});
