Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Vogel2015-09-17 10:30:19 +0000
committerMatthias Sohn2015-09-17 13:28:08 +0000
commite686eb1d45e70f358b6673534cb70348674c9614 (patch)
tree6f96a1b65703214e674351915adce6ec1aeba7f0 /org.eclipse.egit.core.test
parent6d548e3038a6f8f94943d3cc8870b78e0fb20544 (diff)
downloadegit-e686eb1d45e70f358b6673534cb70348674c9614.tar.gz
egit-e686eb1d45e70f358b6673534cb70348674c9614.tar.xz
egit-e686eb1d45e70f358b6673534cb70348674c9614.zip
Add missing @Override annotations to all EGit bundles
Bug: 477689 Change-Id: I490e6558db5133a60caf00af2b996feae0e2e832 Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.egit.core.test')
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/ProjectReferenceImporterTest.java2
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/indexdiff/IndexDiffCacheEntryTest.java6
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/indexdiff/IndexDiffCacheTest.java3
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/GitResourceVariantTreeSubscriberTest.java1
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/storage/IndexFileRevisionTest.java2
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/util/ProjectUtilTest.java2
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/storage/GitBlobStorageTest.java2
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitResourceVariantComparatorTest.java1
-rwxr-xr-xorg.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitResourceVariantTreeSubscriberTest.java1
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitResourceVariantTreeTest.java1
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitSubscriberMergeContextTest.java1
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitSubscriberResourceMappingContextTest.java1
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/dto/GitSynchronizeDataTest.java1
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/AdaptableFileTreeIteratorTest.java1
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/CommitUtilTest.java2
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/ContainerTreeIteratorResourceFilterTest.java1
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/FileDeleteHookTest.java1
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/GitResourceDeltaTestHelper.java2
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/HistoryTest.java2
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/MergeWithPreferredStrategyTest.java2
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/RepositoryCacheTest.java2
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/RevUtilsTest.java2
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/TestRepository.java1
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/internal/mapping/HistoryTest.java1
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/models/ModelTestCase.java1
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/models/SampleModelAdapterFactory.java2
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/AddOperationTest.java2
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/BranchOperationTest.java2
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/CloneOperationTest.java1
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/CommitOperationTest.java2
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/CreatePatchOperationTest.java2
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/EditCommitOperationTest.java2
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/IgnoreOperationTest.java2
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/MergeOperationTest.java2
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/PushOperationTest.java1
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/RebaseOperationTest.java1
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/RemoveFromIndexOperationTest.java2
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/ResetOperationTest.java2
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/RewordCommitsOperationTest.java2
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/SquashCommitsOperationTest.java4
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/StashCreateOperationTest.java2
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/TrackUntrackOperationTest.java2
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/rebase/RebaseInteractivePlanTest.java2
43 files changed, 77 insertions, 0 deletions
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/ProjectReferenceImporterTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/ProjectReferenceImporterTest.java
index cba88e6efa..98b45e8256 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/ProjectReferenceImporterTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/ProjectReferenceImporterTest.java
@@ -35,6 +35,7 @@ public class ProjectReferenceImporterTest extends GitTestCase {
private Repository repository;
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
@@ -44,6 +45,7 @@ public class ProjectReferenceImporterTest extends GitTestCase {
util.addConfiguredRepository(repository.getDirectory());
}
+ @Override
@After
public void tearDown() throws Exception {
RepositoryUtil util = Activator.getDefault().getRepositoryUtil();
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/indexdiff/IndexDiffCacheEntryTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/indexdiff/IndexDiffCacheEntryTest.java
index 0bc4156052..be76713b8e 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/indexdiff/IndexDiffCacheEntryTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/indexdiff/IndexDiffCacheEntryTest.java
@@ -113,6 +113,7 @@ public class IndexDiffCacheEntryTest extends GitTestCase {
cleanEntryFlags();
ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
+ @Override
public void run(IProgressMonitor monitor) throws CoreException {
try {
project.createFile("bla", "bla\n".getBytes("UTF-8"));
@@ -132,6 +133,7 @@ public class IndexDiffCacheEntryTest extends GitTestCase {
cleanEntryFlags();
ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
+ @Override
public void run(IProgressMonitor monitor) throws CoreException {
try {
project.createFile("blip", "blip\n".getBytes("UTF-8"));
@@ -149,6 +151,7 @@ public class IndexDiffCacheEntryTest extends GitTestCase {
cleanEntryFlags();
ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
+ @Override
public void run(IProgressMonitor monitor) throws CoreException {
try {
project.createFile(".gitignore", "\n".getBytes("UTF-8"));
@@ -194,6 +197,7 @@ public class IndexDiffCacheEntryTest extends GitTestCase {
return entry;
}
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
@@ -201,6 +205,7 @@ public class IndexDiffCacheEntryTest extends GitTestCase {
repository = testRepository.getRepository();
}
+ @Override
@After
public void tearDown() throws Exception {
entry.dispose();
@@ -237,6 +242,7 @@ public class IndexDiffCacheEntryTest extends GitTestCase {
return filesToUpdate.size() > MAX_FILES_FOR_UPDATE;
}
+ @Override
public IndexDiffUpdateJob getUpdateJob() {
return super.getUpdateJob();
}
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/indexdiff/IndexDiffCacheTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/indexdiff/IndexDiffCacheTest.java
index 4dde68c655..2759923524 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/indexdiff/IndexDiffCacheTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/indexdiff/IndexDiffCacheTest.java
@@ -43,6 +43,7 @@ public class IndexDiffCacheTest extends GitTestCase {
private AtomicReference<IndexDiffData> indexDiffDataResult;
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
@@ -50,6 +51,7 @@ public class IndexDiffCacheTest extends GitTestCase {
repository = testRepository.getRepository();
}
+ @Override
@After
public void tearDown() throws Exception {
testRepository.dispose();
@@ -259,6 +261,7 @@ public class IndexDiffCacheTest extends GitTestCase {
indexDiffDataResult = new AtomicReference<IndexDiffData>(
null);
cacheEntry.addIndexDiffChangedListener(new IndexDiffChangedListener() {
+ @Override
public void indexDiffChanged(Repository repo,
IndexDiffData indexDiffData) {
listenerCalled.set(true);
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/GitResourceVariantTreeSubscriberTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/GitResourceVariantTreeSubscriberTest.java
index 11046f2985..8b1f9b05a4 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/GitResourceVariantTreeSubscriberTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/GitResourceVariantTreeSubscriberTest.java
@@ -48,6 +48,7 @@ public class GitResourceVariantTreeSubscriberTest extends VariantsTestCase {
private IFile iFile2;
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/storage/IndexFileRevisionTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/storage/IndexFileRevisionTest.java
index 547a0caa03..7e7e98b136 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/storage/IndexFileRevisionTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/storage/IndexFileRevisionTest.java
@@ -33,6 +33,7 @@ import org.junit.Test;
public class IndexFileRevisionTest extends GitTestCase {
private Repository repository;
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
@@ -40,6 +41,7 @@ public class IndexFileRevisionTest extends GitTestCase {
repository.create();
}
+ @Override
@After
public void tearDown() throws Exception {
repository.close();
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/util/ProjectUtilTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/util/ProjectUtilTest.java
index 03493427bf..9300736fdb 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/util/ProjectUtilTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/util/ProjectUtilTest.java
@@ -52,12 +52,14 @@ public class ProjectUtilTest extends GitTestCase {
private TestProject project2;
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
repository = new TestRepository(gitDir);
}
+ @Override
@After
public void tearDown() throws Exception {
super.tearDown();
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/storage/GitBlobStorageTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/storage/GitBlobStorageTest.java
index 640e37dcc0..01e5ee47f3 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/storage/GitBlobStorageTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/storage/GitBlobStorageTest.java
@@ -44,6 +44,7 @@ public class GitBlobStorageTest extends GitTestCase {
Repository repository;
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
@@ -51,6 +52,7 @@ public class GitBlobStorageTest extends GitTestCase {
repository.create();
}
+ @Override
@After
public void tearDown() throws Exception {
repository.close();
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitResourceVariantComparatorTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitResourceVariantComparatorTest.java
index cd6307efa2..557cec9571 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitResourceVariantComparatorTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitResourceVariantComparatorTest.java
@@ -50,6 +50,7 @@ public class GitResourceVariantComparatorTest extends GitTestCase {
private TestRepository testRepo;
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitResourceVariantTreeSubscriberTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitResourceVariantTreeSubscriberTest.java
index 501d9e2eb5..fd56659da2 100755
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitResourceVariantTreeSubscriberTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitResourceVariantTreeSubscriberTest.java
@@ -46,6 +46,7 @@ public class GitResourceVariantTreeSubscriberTest extends GitTestCase {
private IFile changedFile;
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitResourceVariantTreeTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitResourceVariantTreeTest.java
index d8f656a5bc..ec2398121a 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitResourceVariantTreeTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitResourceVariantTreeTest.java
@@ -121,6 +121,7 @@ public class GitResourceVariantTreeTest extends GitTestCase {
IResource[] roots = grvt.roots();
// sort in order to be able to assert the project instances
Arrays.sort(roots, new Comparator<IResource>() {
+ @Override
public int compare(IResource r1, IResource r2) {
String path1 = r1.getFullPath().toString();
String path2 = r2.getFullPath().toString();
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitSubscriberMergeContextTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitSubscriberMergeContextTest.java
index 0bb6825cb9..24e32905a9 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitSubscriberMergeContextTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitSubscriberMergeContextTest.java
@@ -53,6 +53,7 @@ public class GitSubscriberMergeContextTest extends ModelTestCase {
private TestRepository testRepo;
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitSubscriberResourceMappingContextTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitSubscriberResourceMappingContextTest.java
index e7f33de776..dec2db6e87 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitSubscriberResourceMappingContextTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitSubscriberResourceMappingContextTest.java
@@ -47,6 +47,7 @@ public class GitSubscriberResourceMappingContextTest extends GitTestCase {
private TestRepository testRepo;
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/dto/GitSynchronizeDataTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/dto/GitSynchronizeDataTest.java
index f13a1cf51d..1868fde715 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/dto/GitSynchronizeDataTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/dto/GitSynchronizeDataTest.java
@@ -29,6 +29,7 @@ public class GitSynchronizeDataTest extends GitTestCase {
private Repository repo;
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/AdaptableFileTreeIteratorTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/AdaptableFileTreeIteratorTest.java
index c0e35fadef..3740339e9d 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/AdaptableFileTreeIteratorTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/AdaptableFileTreeIteratorTest.java
@@ -39,6 +39,7 @@ public class AdaptableFileTreeIteratorTest extends GitTestCase {
private File file;
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/CommitUtilTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/CommitUtilTest.java
index f598c7df1f..7ec3b2f318 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/CommitUtilTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/CommitUtilTest.java
@@ -33,6 +33,7 @@ public class CommitUtilTest extends GitTestCase {
private RevCommit commit3;
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
@@ -53,6 +54,7 @@ public class CommitUtilTest extends GitTestCase {
"commit 3");
}
+ @Override
@After
public void tearDown() throws Exception {
testRepository.dispose();
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/ContainerTreeIteratorResourceFilterTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/ContainerTreeIteratorResourceFilterTest.java
index 522b14e244..0389a70c64 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/ContainerTreeIteratorResourceFilterTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/ContainerTreeIteratorResourceFilterTest.java
@@ -54,6 +54,7 @@ public class ContainerTreeIteratorResourceFilterTest extends GitTestCase {
private Repository repository;
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/FileDeleteHookTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/FileDeleteHookTest.java
index 0d394b4a9d..a1f879f856 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/FileDeleteHookTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/FileDeleteHookTest.java
@@ -28,6 +28,7 @@ public class FileDeleteHookTest extends GitTestCase {
private TestRepository testRepo;
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/GitResourceDeltaTestHelper.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/GitResourceDeltaTestHelper.java
index 8b743133b0..77d75a0cc9 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/GitResourceDeltaTestHelper.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/GitResourceDeltaTestHelper.java
@@ -64,9 +64,11 @@ public class GitResourceDeltaTestHelper {
public void setUp() {
resourceChangeListener = new IResourceChangeListener() {
+ @Override
public void resourceChanged(final IResourceChangeEvent event) {
try {
event.getDelta().accept(new IResourceDeltaVisitor() {
+ @Override
public boolean visit(IResourceDelta delta)
throws CoreException {
final IResource resource = delta.getResource();
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/HistoryTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/HistoryTest.java
index 8e263eb02c..027290038f 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/HistoryTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/HistoryTest.java
@@ -63,6 +63,7 @@ public class HistoryTest extends GitTestCase {
private IFileHistoryProvider historyProvider;
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
@@ -106,6 +107,7 @@ public class HistoryTest extends GitTestCase {
.getFileHistoryProvider();
}
+ @Override
@After
public void tearDown() throws Exception {
testRepository.dispose();
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/MergeWithPreferredStrategyTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/MergeWithPreferredStrategyTest.java
index 866f5431e0..3857ffe089 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/MergeWithPreferredStrategyTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/MergeWithPreferredStrategyTest.java
@@ -51,6 +51,7 @@ public class MergeWithPreferredStrategyTest extends GitTestCase {
* MergeStrategy that will be used by any operation that needs a merge will
* be the {@link MergeStrategy#OURS}.
*/
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
@@ -80,6 +81,7 @@ public class MergeWithPreferredStrategyTest extends GitTestCase {
/**
* Removes any preference about preferred merge strategy after any test.
*/
+ @Override
@After
public void tearDown() throws Exception {
super.tearDown();
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/RepositoryCacheTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/RepositoryCacheTest.java
index d44ab83b65..fe9ea9e732 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/RepositoryCacheTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/RepositoryCacheTest.java
@@ -35,6 +35,7 @@ public class RepositoryCacheTest extends GitTestCase {
private Repository repository;
private RepositoryCache cache;
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
@@ -43,6 +44,7 @@ public class RepositoryCacheTest extends GitTestCase {
this.cache = Activator.getDefault().getRepositoryCache();
}
+ @Override
@After
public void tearDown() throws Exception {
testRepository.dispose();
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/RevUtilsTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/RevUtilsTest.java
index 6fd7f205e7..e1f0574507 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/RevUtilsTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/RevUtilsTest.java
@@ -28,6 +28,7 @@ public class RevUtilsTest extends GitTestCase {
private TestRepository testRepository;
private Repository repository;
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
@@ -35,6 +36,7 @@ public class RevUtilsTest extends GitTestCase {
repository = testRepository.getRepository();
}
+ @Override
@After
public void tearDown() throws Exception {
testRepository.dispose();
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/TestRepository.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/TestRepository.java
index 2d5e085329..d21a7a7e70 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/TestRepository.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/TestRepository.java
@@ -252,6 +252,7 @@ public class TestRepository {
public void trackAllFiles(IProject project) throws CoreException {
project.accept(new IResourceVisitor() {
+ @Override
public boolean visit(IResource resource) throws CoreException {
if (resource instanceof IFile) {
try {
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/internal/mapping/HistoryTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/internal/mapping/HistoryTest.java
index 493d9469e1..69f5d214be 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/internal/mapping/HistoryTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/internal/mapping/HistoryTest.java
@@ -55,6 +55,7 @@ public class HistoryTest extends GitTestCase {
private File workDir;
private Repository thisGit;
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/models/ModelTestCase.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/models/ModelTestCase.java
index a709aaadc0..4b3a623aa2 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/models/ModelTestCase.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/models/ModelTestCase.java
@@ -56,6 +56,7 @@ import org.junit.Before;
public abstract class ModelTestCase extends GitTestCase {
protected static final String SAMPLE_FILE_EXTENSION = SampleModelProvider.SAMPLE_FILE_EXTENSION;
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/models/SampleModelAdapterFactory.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/models/SampleModelAdapterFactory.java
index f4291913d4..da7f89a51a 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/models/SampleModelAdapterFactory.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/models/SampleModelAdapterFactory.java
@@ -13,6 +13,7 @@ import org.eclipse.core.runtime.IAdapterFactory;
import org.eclipse.team.core.mapping.IResourceMappingMerger;
public class SampleModelAdapterFactory implements IAdapterFactory {
+ @Override
public Object getAdapter(Object adaptableObject, Class adapterType) {
if (adaptableObject instanceof SampleModelProvider
&& IResourceMappingMerger.class.isAssignableFrom(adapterType)) {
@@ -22,6 +23,7 @@ public class SampleModelAdapterFactory implements IAdapterFactory {
return null;
}
+ @Override
public Class[] getAdapterList() {
return new Class[] { IResourceMappingMerger.class, };
}
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/AddOperationTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/AddOperationTest.java
index 02c4989eef..b2fe65debb 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/AddOperationTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/AddOperationTest.java
@@ -33,6 +33,7 @@ public class AddOperationTest extends GitTestCase {
TestRepository testRepository;
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
@@ -42,6 +43,7 @@ public class AddOperationTest extends GitTestCase {
testRepository.connect(project.getProject());
}
+ @Override
@After
public void tearDown() throws Exception {
testRepository.dispose();
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/BranchOperationTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/BranchOperationTest.java
index 2f6b0de69c..db2744602c 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/BranchOperationTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/BranchOperationTest.java
@@ -29,6 +29,7 @@ public class BranchOperationTest extends GitTestCase{
TestRepository testRepository;
Repository repository;
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
@@ -36,6 +37,7 @@ public class BranchOperationTest extends GitTestCase{
repository = testRepository.getRepository();
}
+ @Override
@After
public void tearDown() throws Exception {
testRepository.dispose();
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/CloneOperationTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/CloneOperationTest.java
index 1c69cd7721..fba5bbbd89 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/CloneOperationTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/CloneOperationTest.java
@@ -130,6 +130,7 @@ public class CloneOperationTest extends DualRepositoryTestCase {
final File[] repoDir = new File[1];
clop.addPostCloneTask(new PostCloneTask() {
+ @Override
public void execute(Repository repository, IProgressMonitor monitor)
throws CoreException {
repoDir[0] = repository.getDirectory();
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/CommitOperationTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/CommitOperationTest.java
index 3b3f3b3c1d..d8fcc7cee0 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/CommitOperationTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/CommitOperationTest.java
@@ -48,6 +48,7 @@ public class CommitOperationTest extends GitTestCase {
Repository repository;
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
@@ -58,6 +59,7 @@ public class CommitOperationTest extends GitTestCase {
testRepository.connect(project.getProject());
}
+ @Override
@After
public void tearDown() throws Exception {
testRepository.dispose();
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/CreatePatchOperationTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/CreatePatchOperationTest.java
index 31be9fe5b8..428b3e0b5c 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/CreatePatchOperationTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/CreatePatchOperationTest.java
@@ -85,6 +85,7 @@ public class CreatePatchOperationTest extends GitTestCase {
private TestRepository testRepository;
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
@@ -99,6 +100,7 @@ public class CreatePatchOperationTest extends GitTestCase {
"new file");
}
+ @Override
@After
public void tearDown() throws Exception {
testRepository.dispose();
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/EditCommitOperationTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/EditCommitOperationTest.java
index f7f8123976..ae91487eb1 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/EditCommitOperationTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/EditCommitOperationTest.java
@@ -40,6 +40,7 @@ public class EditCommitOperationTest extends GitTestCase {
private RevCommit secondCommit;
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
@@ -58,6 +59,7 @@ public class EditCommitOperationTest extends GitTestCase {
.addAndCommit(project.getProject(), file, "second commit");
}
+ @Override
@After
public void tearDown() throws Exception {
testRepository.dispose();
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/IgnoreOperationTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/IgnoreOperationTest.java
index cc74ee7509..f8e8595e12 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/IgnoreOperationTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/IgnoreOperationTest.java
@@ -45,6 +45,7 @@ public class IgnoreOperationTest extends GitTestCase {
private TestRepository testRepository;
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
@@ -52,6 +53,7 @@ public class IgnoreOperationTest extends GitTestCase {
testRepository.connect(project.getProject());
}
+ @Override
@After
public void tearDown() throws Exception {
testRepository.dispose();
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/MergeOperationTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/MergeOperationTest.java
index 6af4cd6f57..59fc6594fd 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/MergeOperationTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/MergeOperationTest.java
@@ -39,6 +39,7 @@ public class MergeOperationTest extends GitTestCase {
private TestRepository testRepository;
private RevCommit secondCommit;
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
@@ -57,6 +58,7 @@ public class MergeOperationTest extends GitTestCase {
testRepository.checkoutBranch(SIDE);
}
+ @Override
@After
public void tearDown() throws Exception {
testRepository.dispose();
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/PushOperationTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/PushOperationTest.java
index b119065e77..a24a1fc8be 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/PushOperationTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/PushOperationTest.java
@@ -217,6 +217,7 @@ public class PushOperationTest extends DualRepositoryTestCase {
private boolean loggedSomething = false;
private boolean loggedException = false;
+ @Override
public void logging(IStatus status, String plugin) {
loggedSomething = true;
loggedException = status.getException() != null;
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/RebaseOperationTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/RebaseOperationTest.java
index 24f56497a0..478a76107a 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/RebaseOperationTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/RebaseOperationTest.java
@@ -45,6 +45,7 @@ public class RebaseOperationTest extends GitTestCase {
Git git;
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/RemoveFromIndexOperationTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/RemoveFromIndexOperationTest.java
index 3c2d9b95f0..9050fce4b4 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/RemoveFromIndexOperationTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/RemoveFromIndexOperationTest.java
@@ -41,6 +41,7 @@ public class RemoveFromIndexOperationTest extends GitTestCase {
private TestRepository testRepo2;
private TestProject project2;
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
@@ -58,6 +59,7 @@ public class RemoveFromIndexOperationTest extends GitTestCase {
testRepo2.commit("initial commit repo 2");
}
+ @Override
@After
public void tearDown() throws Exception {
testRepo.dispose();
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/ResetOperationTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/ResetOperationTest.java
index 2f6bc74cb4..a64a9d69cb 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/ResetOperationTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/ResetOperationTest.java
@@ -42,6 +42,7 @@ public class ResetOperationTest extends GitTestCase {
IFile fileInIndex;
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
@@ -49,6 +50,7 @@ public class ResetOperationTest extends GitTestCase {
repository = testRepository.getRepository();
}
+ @Override
@After
public void tearDown() throws Exception {
testRepository.dispose();
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/RewordCommitsOperationTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/RewordCommitsOperationTest.java
index 770cb0d1c3..fa19d8960e 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/RewordCommitsOperationTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/RewordCommitsOperationTest.java
@@ -31,6 +31,7 @@ public class RewordCommitsOperationTest extends GitTestCase {
private RevCommit commit;
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
@@ -45,6 +46,7 @@ public class RewordCommitsOperationTest extends GitTestCase {
"a commit");
}
+ @Override
@After
public void tearDown() throws Exception {
testRepository.dispose();
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/SquashCommitsOperationTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/SquashCommitsOperationTest.java
index e235006814..69970a7fc2 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/SquashCommitsOperationTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/SquashCommitsOperationTest.java
@@ -39,6 +39,7 @@ public class SquashCommitsOperationTest extends GitTestCase {
private RevCommit commit2;
private RevCommit commit3;
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
@@ -59,6 +60,7 @@ public class SquashCommitsOperationTest extends GitTestCase {
"commit 3");
}
+ @Override
@After
public void tearDown() throws Exception {
testRepository.dispose();
@@ -68,10 +70,12 @@ public class SquashCommitsOperationTest extends GitTestCase {
@Test
public void squash() throws Exception {
InteractiveHandler messageHandler = new InteractiveHandler() {
+ @Override
public void prepareSteps(List<RebaseTodoLine> steps) {
// not used
}
+ @Override
public String modifyCommitMessage(String commit) {
return "squashed";
}
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/StashCreateOperationTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/StashCreateOperationTest.java
index 026119079a..aebe8761c3 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/StashCreateOperationTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/StashCreateOperationTest.java
@@ -34,6 +34,7 @@ public class StashCreateOperationTest extends GitTestCase {
Repository repository;
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
@@ -45,6 +46,7 @@ public class StashCreateOperationTest extends GitTestCase {
testRepository.commit("initial commit");
}
+ @Override
@After
public void tearDown() throws Exception {
testRepository.dispose();
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/TrackUntrackOperationTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/TrackUntrackOperationTest.java
index 7643d2820f..a00e4580c2 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/TrackUntrackOperationTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/TrackUntrackOperationTest.java
@@ -71,6 +71,7 @@ public class TrackUntrackOperationTest extends DualRepositoryTestCase {
project.accept(new IResourceVisitor() {
+ @Override
public boolean visit(IResource resource) throws CoreException {
if (resource instanceof IFile)
files.add((IFile) resource);
@@ -116,6 +117,7 @@ public class TrackUntrackOperationTest extends DualRepositoryTestCase {
project.accept(new IResourceVisitor() {
+ @Override
public boolean visit(IResource resource) throws CoreException {
if (resource instanceof IFile)
files.add((IFile) resource);
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/rebase/RebaseInteractivePlanTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/rebase/RebaseInteractivePlanTest.java
index 7ee0a75775..efd89a7fa0 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/rebase/RebaseInteractivePlanTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/rebase/RebaseInteractivePlanTest.java
@@ -44,6 +44,7 @@ public class RebaseInteractivePlanTest extends GitTestCase {
private TestRepository testRepository;
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
@@ -56,6 +57,7 @@ public class RebaseInteractivePlanTest extends GitTestCase {
moveHelper = new RebaseInteractivePlan.MoveHelper(toDoElements, plan);
}
+ @Override
@After
public void tearDown() throws Exception {
plan.dispose();

Back to the top