opendev/gerrit
Code Issues Proposed changes

Rename getCurrentUser to getUser

Browse Source 
It is never ambiguous to say "User" instead of "CurrentUser". Save
some typing.

Change-Id: I03a051f1fd3758ba63749cded20a7c135b6cf58a
This commit is contained in:
Dave Borowitz
2015-10-19 09:53:49 -04:00
parent c42c0cd81c
commit 85f0487714
82 changed files with 141 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
View File

@@ -390,7 +390,7 @@ public class ReceiveCommits {
final ChangeEditUtil editUtil,
final BatchUpdate.Factory batchUpdateFactory,
final SetHashtagsOp.Factory hashtagsFactory) throws IOException {
this.currentUser = (IdentifiedUser) projectControl.getCurrentUser();
this.currentUser = (IdentifiedUser) projectControl.getUser();
this.db = db;
this.queryProvider = queryProvider;
this.changeDataFactory = changeDataFactory;
@@ -1809,7 +1809,7 @@ public class ReceiveCommits {
RevisionResource rsrc = new RevisionResource(changes.parse(changeCtl), ps);
try {
mergeOpProvider.get().merge(db, rsrc.getChange(),
(IdentifiedUser) changeCtl.getCurrentUser(), false);
(IdentifiedUser) changeCtl.getUser(), false);
} catch (NoSuchChangeException e) {
throw new OrmException(e);
}