opendev
/
gerrit
Code Issues Proposed changes

Fix unused and deprecation warnings 

Despite our best efforts to resolve warnings, some new ones slipped in
late this afternoon.

Change-Id: I4b8f8bba08de2d5c7a2a03c04d121c0e447bfa8e
Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce 2011-05-19 16:52:03 -07:00
parent 98f1ecfeae
commit b052ca8dcf
3 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PatchTable.java
View File

@ -290,8 +290,6 @@ public class PatchTable extends Composite {
private static final int C_SIDEBYSIDE = 5; private static final int C_SIDEBYSIDE = 5;
private int activeRow = -1; private int activeRow = -1;
private PatchSet.Id patchSetIdToCompareWith;
MyTable() { MyTable() {
keysNavigation.add(new PrevKeyCommand(0, 'k', Util.C.patchTablePrev())); keysNavigation.add(new PrevKeyCommand(0, 'k', Util.C.patchTablePrev()));
keysNavigation.add(new NextKeyCommand(0, 'j', Util.C.patchTableNext())); keysNavigation.add(new NextKeyCommand(0, 'j', Util.C.patchTableNext()));

3
gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchScreen.java
View File

@ -112,9 +112,6 @@ public abstract class PatchScreen extends Screen implements
} }
}; };
// The change id for which the above patch set id's are valid
private static Change.Id currentChangeId = null;
protected final Patch.Key patchKey; protected final Patch.Key patchKey;
protected PatchSetDetail patchSetDetail; protected PatchSetDetail patchSetDetail;
protected PatchTable fileList; protected PatchTable fileList;

12
gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/PatchSetDetailFactory.java
View File

@ -19,16 +19,15 @@ import com.google.gerrit.common.errors.NoSuchEntityException;
import com.google.gerrit.httpd.rpc.Handler; import com.google.gerrit.httpd.rpc.Handler;
import com.google.gerrit.reviewdb.Account; import com.google.gerrit.reviewdb.Account;
import com.google.gerrit.reviewdb.AccountDiffPreference; import com.google.gerrit.reviewdb.AccountDiffPreference;
import com.google.gerrit.reviewdb.AccountDiffPreference.Whitespace;
import com.google.gerrit.reviewdb.AccountPatchReview; import com.google.gerrit.reviewdb.AccountPatchReview;
import com.google.gerrit.reviewdb.Patch; import com.google.gerrit.reviewdb.Patch;
import com.google.gerrit.reviewdb.PatchLineComment; import com.google.gerrit.reviewdb.PatchLineComment;
import com.google.gerrit.reviewdb.PatchSet; import com.google.gerrit.reviewdb.PatchSet;
import com.google.gerrit.reviewdb.Project; import com.google.gerrit.reviewdb.Project;
import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.reviewdb.ReviewDb;
import com.google.gerrit.reviewdb.AccountDiffPreference.Whitespace;
import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.patch.PatchList; import com.google.gerrit.server.patch.PatchList;
import com.google.gerrit.server.patch.PatchListCache; import com.google.gerrit.server.patch.PatchListCache;
import com.google.gerrit.server.patch.PatchListKey; import com.google.gerrit.server.patch.PatchListKey;
@ -40,9 +39,7 @@ import com.google.gwtorm.client.OrmException;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.Assisted;
import org.eclipse.jgit.errors.RepositoryNotFoundException;
import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Repository;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -63,8 +60,6 @@ class PatchSetDetailFactory extends Handler<PatchSetDetail> {
@Assisted("psIdOld") PatchSet.Id psIdB, AccountDiffPreference diffPrefs); @Assisted("psIdOld") PatchSet.Id psIdB, AccountDiffPreference diffPrefs);
} }
private final GitRepositoryManager repoManager;
private final PatchSetInfoFactory infoFactory; private final PatchSetInfoFactory infoFactory;
private final ReviewDb db; private final ReviewDb db;
private final PatchListCache patchListCache; private final PatchListCache patchListCache;
@ -82,14 +77,12 @@ class PatchSetDetailFactory extends Handler<PatchSetDetail> {
PatchSet patchSet; PatchSet patchSet;
@Inject @Inject
PatchSetDetailFactory(final GitRepositoryManager grm, PatchSetDetailFactory(final PatchSetInfoFactory psif, final ReviewDb db,
final PatchSetInfoFactory psif, final ReviewDb db,
final PatchListCache patchListCache, final PatchListCache patchListCache,
final ChangeControl.Factory changeControlFactory, final ChangeControl.Factory changeControlFactory,
@Assisted("psIdNew") final PatchSet.Id psIdNew, @Assisted("psIdNew") final PatchSet.Id psIdNew,
@Assisted("psIdOld") @Nullable final PatchSet.Id psIdOld, @Assisted("psIdOld") @Nullable final PatchSet.Id psIdOld,
@Assisted @Nullable final AccountDiffPreference diffPrefs) { @Assisted @Nullable final AccountDiffPreference diffPrefs) {
this.repoManager = grm;
this.infoFactory = psif; this.infoFactory = psif;
this.db = db; this.db = db;
this.patchListCache = patchListCache; this.patchListCache = patchListCache;
@ -100,7 +93,6 @@ class PatchSetDetailFactory extends Handler<PatchSetDetail> {
this.diffPrefs = diffPrefs; this.diffPrefs = diffPrefs;
} }
@SuppressWarnings("deprecation")
@Override @Override
public PatchSetDetail call() throws OrmException, NoSuchEntityException, public PatchSetDetail call() throws OrmException, NoSuchEntityException,
PatchSetInfoNotAvailableException, NoSuchChangeException { PatchSetInfoNotAvailableException, NoSuchChangeException {