Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Aniszczyk2010-08-19 02:01:58 +0000
committerChris Aniszczyk2010-08-19 02:01:58 +0000
commit4786efe5c5e6aad165f11b2dd72b7dc7f3758e94 (patch)
tree31195017ec24f2020c8974ef3eb04499fdebefe9
parentb818365bd47b0c491b9bff7a8cf648153cc7ad83 (diff)
downloadegit-4786efe5c5e6aad165f11b2dd72b7dc7f3758e94.tar.gz
egit-4786efe5c5e6aad165f11b2dd72b7dc7f3758e94.tar.xz
egit-4786efe5c5e6aad165f11b2dd72b7dc7f3758e94.zip
Keep up with Tag API changes
The Tag API from JGit was changed to remove duplication. Change-Id: I562198f7a6c21b659e78339ef8c4d9d2bff248ab Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/TagOperationTest.java10
-rw-r--r--org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/BranchAndResetActionTest.java3
-rw-r--r--org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/CommitActionTest.java3
-rw-r--r--org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/TagActionTest.java3
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/RefContentProposal.java3
5 files changed, 17 insertions, 5 deletions
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/TagOperationTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/TagOperationTest.java
index f97f37e63a..8a473daec8 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/TagOperationTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/TagOperationTest.java
@@ -1,3 +1,11 @@
+/*******************************************************************************
+ * Copyright (C) 2010, Chris Aniszczyk <caniszczyk@gmail.com>
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *******************************************************************************/
package org.eclipse.egit.core.test.op;
import static org.junit.Assert.assertFalse;
@@ -85,7 +93,7 @@ public class TagOperationTest extends DualRepositoryTestCase {
Tag newTag = new Tag(repository1.getRepository());
newTag.setTag("TheNewTag");
newTag.setMessage("Well, I'm the tag");
- newTag.setAuthor(new PersonIdent(TestUtils.AUTHOR));
+ newTag.setTagger(new PersonIdent(TestUtils.AUTHOR));
newTag.setObjId(repository1.getRepository()
.resolve("refs/heads/master"));
TagOperation top = new TagOperation(repository1.getRepository(),
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/BranchAndResetActionTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/BranchAndResetActionTest.java
index 3c694cf208..7e8da44e37 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/BranchAndResetActionTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/BranchAndResetActionTest.java
@@ -7,6 +7,7 @@
*
* Contributors:
* Mathias Kinzler (SAP AG) - initial implementation
+ * Chris Aniszczyk <caniszczyk@gmail.com> - tag API changes
*******************************************************************************/
package org.eclipse.egit.ui.test.team.actions;
@@ -66,7 +67,7 @@ public class BranchAndResetActionTest extends LocalRepositoryTestCase {
Tag tag = new Tag(repo);
tag.setTag("SomeTag");
- tag.setAuthor(new PersonIdent(TestUtil.TESTAUTHOR));
+ tag.setTagger(new PersonIdent(TestUtil.TESTAUTHOR));
tag.setMessage("I'm just a little tag");
tag.setObjId(repo.resolve(repo.getFullBranch()));
TagOperation top = new TagOperation(repo, tag, false);
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/CommitActionTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/CommitActionTest.java
index 5f0117fa19..1f593d0404 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/CommitActionTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/CommitActionTest.java
@@ -7,6 +7,7 @@
*
* Contributors:
* Mathias Kinzler (SAP AG) - initial implementation
+ * Chris Aniszczyk <caniszczyk@gmail.com> - tag API changes
*******************************************************************************/
package org.eclipse.egit.ui.test.team.actions;
@@ -55,7 +56,7 @@ public class CommitActionTest extends LocalRepositoryTestCase {
Tag tag = new Tag(repo);
tag.setTag("SomeTag");
- tag.setAuthor(new PersonIdent(TestUtil.TESTAUTHOR));
+ tag.setTagger(new PersonIdent(TestUtil.TESTAUTHOR));
tag.setMessage("I'm just a little tag");
tag.setObjId(repo.resolve(repo.getFullBranch()));
TagOperation top = new TagOperation(repo, tag, false);
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/TagActionTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/TagActionTest.java
index e6c0dbe184..58259edadb 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/TagActionTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/TagActionTest.java
@@ -7,6 +7,7 @@
*
* Contributors:
* Mathias Kinzler (SAP AG) - initial implementation
+ * Chris Aniszczyk <caniszczyk@gmail.com> - tag API changes
*******************************************************************************/
package org.eclipse.egit.ui.test.team.actions;
@@ -56,7 +57,7 @@ public class TagActionTest extends LocalRepositoryTestCase {
Tag tag = new Tag(repo);
tag.setTag("SomeTag");
- tag.setAuthor(new PersonIdent(TestUtil.TESTAUTHOR));
+ tag.setTagger(new PersonIdent(TestUtil.TESTAUTHOR));
tag.setMessage("I'm just a little tag");
tag.setObjId(repo.resolve(repo.getFullBranch()));
TagOperation top = new TagOperation(repo, tag, false);
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 04aeafa2ad..3eb5390eca 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
@@ -1,5 +1,6 @@
/*******************************************************************************
* Copyright (C) 2008, Marek Zawirski <marek.zawirski@gmail.com>
+ * Copyright (C) 2010, Chris Aniszczyk <caniszczyk@gmail.com>
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -137,7 +138,7 @@ public class RefContentProposal implements IContentProposal {
RevWalk walk = new RevWalk(db);
Tag t = walk.parseTag(objectId).asTag(walk);
appendObjectSummary(sb, UIText.RefContentProposal_tag, t
- .getAuthor(), t.getMessage());
+ .getTagger(), t.getMessage());
break;
case Constants.OBJ_TREE:
sb.append(UIText.RefContentProposal_tree);

Back to the top