PullRequestCreateChange: Don't explicitly import ProjectControl.Factory Also correct spelling of the member variable. Change-Id: Iab3a040de46dad6c17ab2ac34d7f21412acbbafb
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestCreateChange.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestCreateChange.java index 6170ab6..e04c3d6 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestCreateChange.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestCreateChange.java
@@ -58,7 +58,6 @@ import com.google.gerrit.server.project.NoSuchChangeException; import com.google.gerrit.server.project.NoSuchProjectException; import com.google.gerrit.server.project.ProjectControl; -import com.google.gerrit.server.project.ProjectControl.Factory; import com.google.gerrit.server.project.RefControl; import com.google.gerrit.server.ssh.NoSshInfo; import com.google.gerrit.server.util.TimeUtil; @@ -75,7 +74,7 @@ private final CommitValidators.Factory commitValidatorsFactory; private final ChangeInserter.Factory changeInserterFactory; private final PatchSetInserter.Factory patchSetInserterFactory; - private final Factory projectControlFactor; + private final ProjectControl.Factory projectControlFactory; private final GenericFactory userFactory; @@ -90,7 +89,7 @@ this.commitValidatorsFactory = commitValidatorsFactory; this.changeInserterFactory = changeInserterFactory; this.patchSetInserterFactory = patchSetInserterFactory; - this.projectControlFactor = projectControlFactory; + this.projectControlFactory = projectControlFactory; this.userFactory = userFactory; } @@ -108,7 +107,7 @@ } RefControl refControl = - projectControlFactor.controlFor(project.getNameKey()).controlForRef( + projectControlFactory.controlFor(project.getNameKey()).controlForRef( destinationBranch); try { @@ -164,7 +163,7 @@ Change destChange = destChanges.get(0); ChangeControl changeControl = - projectControlFactor.controlFor(project.getNameKey()).controlFor( + projectControlFactory.controlFor(project.getNameKey()).controlFor( destChange); return insertPatchSet(git, revWalk, destChange, pullRequestCommit,