diff options
author | Tomasz Zarna | 2017-06-20 16:21:47 +0000 |
---|---|---|
committer | Tomasz Zarna | 2017-06-20 20:43:56 +0000 |
commit | b036e15f646427cccd80058898e68cd3acbb96aa (patch) | |
tree | aece00c5ff60c8211530f51c7c6498863bcb84de | |
parent | 64538689d2766aa5d3814522bd936d05c4b389cd (diff) | |
download | org.eclipse.mylyn.reviews-b036e15f646427cccd80058898e68cd3acbb96aa.tar.gz org.eclipse.mylyn.reviews-b036e15f646427cccd80058898e68cd3acbb96aa.tar.xz org.eclipse.mylyn.reviews-b036e15f646427cccd80058898e68cd3acbb96aa.zip |
506866: fix typo in RelatedChangeAndCommitInfo.getCurrentRevisionNumber
Change-Id: I1502051cf0979af1310787d1d624652c3db5d5bc
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=506866
2 files changed, 26 insertions, 18 deletions
diff --git a/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritClient29.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritClient29.java index e0b709da1..315f2391e 100644 --- a/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritClient29.java +++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritClient29.java @@ -81,8 +81,9 @@ public class GerritClient29 extends GerritClient { throw new GerritException(NOT_SIGNED_IN, -32603); } String query = "/accounts/self"; //$NON-NLS-1$/ - org.eclipse.mylyn.internal.gerrit.core.client.rest.AccountInfo accountInfo = getRestClient().executeGetRestRequest( - query, org.eclipse.mylyn.internal.gerrit.core.client.rest.AccountInfo.class, monitor); + org.eclipse.mylyn.internal.gerrit.core.client.rest.AccountInfo accountInfo = getRestClient() + .executeGetRestRequest(query, org.eclipse.mylyn.internal.gerrit.core.client.rest.AccountInfo.class, + monitor); Account account = new Account(new Account.Id(accountInfo.getId())); account.setFullName(accountInfo.getName()); @@ -120,7 +121,8 @@ public class GerritClient29 extends GerritClient { return getChangeDetail(id.getParentKey().get(), monitor); } - private ChangeMessage convertChangeMessage(int reviewId, ChangeInfo changeInfo, ChangeMessageInfo changeMessageInfo) { + private ChangeMessage convertChangeMessage(int reviewId, ChangeInfo changeInfo, + ChangeMessageInfo changeMessageInfo) { Change.Id changeId = new Change.Id(reviewId); ChangeMessage.Key changeMessageKey = new ChangeMessage.Key(changeId, changeInfo.getId()); org.eclipse.mylyn.internal.gerrit.core.client.rest.AccountInfo author = changeMessageInfo.getAuthor(); @@ -140,7 +142,8 @@ public class GerritClient29 extends GerritClient { return branchKey; } - private Change createChange(String keyString, int changeIdValue, AccountInfo accountInfo, Branch.NameKey branchKey) { + private Change createChange(String keyString, int changeIdValue, AccountInfo accountInfo, + Branch.NameKey branchKey) { Change.Key key = new Change.Key(keyString); Change.Id changeId = new Change.Id(changeIdValue); Change change = new Change(key, changeId, accountInfo.getId(), branchKey); @@ -157,11 +160,12 @@ public class GerritClient29 extends GerritClient { AccountInfo accountInfo, Branch.NameKey branchKey) { Change change = createChange(info.getChangeId(), info.getChangeNumber(), accountInfo, branchKey); - PatchSet.Id patchsetId = new PatchSet.Id(change.getId(), info.getCurrentRevisionNumbe()); + PatchSet.Id patchsetId = new PatchSet.Id(change.getId(), info.getCurrentRevisionNumber()); PatchSetInfo patchSetInfo = getPatchSetInfo(patchsetId, info.getCommitInfo().getSubject()); change.setCurrentPatchSet(patchSetInfo); - com.google.gerrit.common.data.ChangeInfo googleChangeInfo = new com.google.gerrit.common.data.ChangeInfo(change); + com.google.gerrit.common.data.ChangeInfo googleChangeInfo = new com.google.gerrit.common.data.ChangeInfo( + change); return googleChangeInfo; } @@ -313,7 +317,8 @@ public class GerritClient29 extends GerritClient { if (containsMessageFromGerritSystem) { //add Gerrit system if there was a ChangeMessageInfo that was created by the Gerrit system - listAccountInfo.add(org.eclipse.mylyn.internal.gerrit.core.client.compat.GerritSystemAccount.GERRIT_SYSTEM.getGerritSystemAccountInfo()); + listAccountInfo.add(org.eclipse.mylyn.internal.gerrit.core.client.compat.GerritSystemAccount.GERRIT_SYSTEM + .getGerritSystemAccountInfo()); } AccountInfoCache accountInfoCache = new AccountInfoCache(listAccountInfo); @@ -334,7 +339,8 @@ public class GerritClient29 extends GerritClient { changeDetail.setApprovalTypes(changeInfo.convertToApprovalTypes()); //Fill the submit records - String querysubmit = "/changes/" + Integer.toString(reviewId) + "/revisions/current/test.submit_rule?filters=SKIP"; //$NON-NLS-1$//$NON-NLS-2$ + String querysubmit = "/changes/" + Integer.toString(reviewId) //$NON-NLS-1$ + + "/revisions/current/test.submit_rule?filters=SKIP"; //$NON-NLS-1$ List<SubmitRecord> submitRecord = currentSubmitRecord(querysubmit, monitor); changeDetail.setSubmitRecords(submitRecord); if (changeDetail.getApprovalTypes() == null && getGerritConfig() != null) { @@ -476,8 +482,8 @@ public class GerritClient29 extends GerritClient { private PatchSetInfo setAccountPatchSetInfo(PatchSetInfo patchSetInfo, IProgressMonitor monitor) { if (patchSetInfo.getAuthor().getAccount() == null) { - patchSetInfo.setAuthor(setUserIdentity(patchSetInfo.getAuthor().getName(), patchSetInfo.getAuthor(), - "Author", monitor)); //$NON-NLS-1$ + patchSetInfo.setAuthor( + setUserIdentity(patchSetInfo.getAuthor().getName(), patchSetInfo.getAuthor(), "Author", monitor)); //$NON-NLS-1$ } if (patchSetInfo.getCommitter().getAccount() == null) { patchSetInfo.setCommitter(setUserIdentity(patchSetInfo.getCommitter().getName(), @@ -493,12 +499,14 @@ public class GerritClient29 extends GerritClient { } String st = URIUtil.encodeQuery(account); final String uri = "/accounts/" + st; //$NON-NLS-1$ - org.eclipse.mylyn.internal.gerrit.core.client.rest.AccountInfo accountInfo = getRestClient().executeGetRestRequest( - uri, org.eclipse.mylyn.internal.gerrit.core.client.rest.AccountInfo.class, monitor); + org.eclipse.mylyn.internal.gerrit.core.client.rest.AccountInfo accountInfo = getRestClient() + .executeGetRestRequest(uri, org.eclipse.mylyn.internal.gerrit.core.client.rest.AccountInfo.class, + monitor); return accountInfo; } - private UserIdentity setUserIdentity(String name, UserIdentity userIdentity, String user, IProgressMonitor monitor) { + private UserIdentity setUserIdentity(String name, UserIdentity userIdentity, String user, + IProgressMonitor monitor) { org.eclipse.mylyn.internal.gerrit.core.client.rest.AccountInfo accountInfo = null; try { accountInfo = getAccountInfo(name, monitor); @@ -506,8 +514,8 @@ public class GerritClient29 extends GerritClient { userIdentity.setAccount(accountId); } catch (GerritException gerritException) { if (gerritException.getMessage().indexOf(HttpStatus.SC_NOT_FOUND) != 0) { - StatusHandler.log(new Status(IStatus.WARNING, GerritCorePlugin.PLUGIN_ID, NLS.bind( - "GerritException {0} not found", user), gerritException)); //$NON-NLS-1$ + StatusHandler.log(new Status(IStatus.WARNING, GerritCorePlugin.PLUGIN_ID, + NLS.bind("GerritException {0} not found", user), gerritException)); //$NON-NLS-1$ } } catch (URIException uriException) { StatusHandler.log(new Status(IStatus.ERROR, GerritCorePlugin.PLUGIN_ID, diff --git a/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/rest/RelatedChangeAndCommitInfo.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/rest/RelatedChangeAndCommitInfo.java index ec526b23d..cf6361461 100644 --- a/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/rest/RelatedChangeAndCommitInfo.java +++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/rest/RelatedChangeAndCommitInfo.java @@ -12,8 +12,8 @@ package org.eclipse.mylyn.internal.gerrit.core.client.rest; /** - * Data model object for <a - * href="https://gerrit-review.googlesource.com/Documentation/rest-api-changes.html#related-change-and-commit-info" + * Data model object for + * <a href="https://gerrit-review.googlesource.com/Documentation/rest-api-changes.html#related-change-and-commit-info" * >RelatedChangeAndCommitInfo</a>. */ public class RelatedChangeAndCommitInfo { @@ -44,7 +44,7 @@ public class RelatedChangeAndCommitInfo { return _revision_number; } - public int getCurrentRevisionNumbe() { + public int getCurrentRevisionNumber() { return _current_revision_number; } |