From cb115b6d24061868b75aeacce353c4c7c912f0d0 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Thu, 19 May 2011 11:51:54 -0700 Subject: [PATCH] Fix unused import/code warnings Change-Id: Icb4968bfc340333ee613cfe3dfe01d3de49358d4 Signed-off-by: Shawn O. Pearce --- .../gerrit/client/changes/PatchSetComplexDisclosurePanel.java | 1 - .../google/gerrit/client/changes/PublishCommentScreen.java | 3 +-- .../gerrit/httpd/rpc/project/ChangeProjectSettings.java | 3 +-- .../src/main/java/com/google/gerrit/pgm/ScanTrackingIds.java | 2 -- .../java/com/google/gerrit/server/git/ReceiveCommits.java | 4 ---- .../google/gerrit/sshd/args4j/AccountGroupUUIDHandler.java | 2 +- 6 files changed, 3 insertions(+), 12 deletions(-) diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PatchSetComplexDisclosurePanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PatchSetComplexDisclosurePanel.java index cba3168314..4561208193 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PatchSetComplexDisclosurePanel.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PatchSetComplexDisclosurePanel.java @@ -27,7 +27,6 @@ import com.google.gerrit.common.data.PatchSetDetail; import com.google.gerrit.reviewdb.Account; import com.google.gerrit.reviewdb.AccountDiffPreference; import com.google.gerrit.reviewdb.AccountGeneralPreferences; -import com.google.gerrit.reviewdb.ApprovalCategory; import com.google.gerrit.reviewdb.AccountGeneralPreferences.DownloadCommand; import com.google.gerrit.reviewdb.AccountGeneralPreferences.DownloadScheme; import com.google.gerrit.reviewdb.Change; diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java index 127009fb74..f7f8ae16a5 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java @@ -42,11 +42,11 @@ import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.FormPanel; +import com.google.gwt.user.client.ui.FormPanel.SubmitEvent; import com.google.gwt.user.client.ui.Panel; import com.google.gwt.user.client.ui.RadioButton; import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; -import com.google.gwt.user.client.ui.FormPanel.SubmitEvent; import com.google.gwtexpui.globalkey.client.NpTextArea; import com.google.gwtjsonrpc.client.VoidResult; @@ -57,7 +57,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Set; public class PublishCommentScreen extends AccountScreen implements ClickHandler, CommentEditorContainer { diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ChangeProjectSettings.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ChangeProjectSettings.java index b720062fff..2b0f8561cf 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ChangeProjectSettings.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ChangeProjectSettings.java @@ -65,8 +65,7 @@ class ChangeProjectSettings extends Handler { @Override public ProjectDetail call() throws NoSuchProjectException, OrmException { final Project.NameKey projectName = update.getNameKey(); - final ProjectControl projectControl = - projectControlFactory.ownerFor(projectName); + projectControlFactory.ownerFor(projectName); final MetaDataUpdate md; try { diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/ScanTrackingIds.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/ScanTrackingIds.java index 4ad274b408..45f560a006 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/ScanTrackingIds.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/ScanTrackingIds.java @@ -17,7 +17,6 @@ package com.google.gerrit.pgm; import static com.google.gerrit.server.schema.DataSourceProvider.Context.MULTI_USER; import com.google.gerrit.lifecycle.LifecycleManager; -import com.google.gerrit.lifecycle.LifecycleModule; import com.google.gerrit.pgm.util.SiteProgram; import com.google.gerrit.reviewdb.Change; import com.google.gerrit.reviewdb.PatchSet; @@ -26,7 +25,6 @@ import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.ChangeUtil; import com.google.gerrit.server.config.TrackingFooters; import com.google.gerrit.server.git.GitRepositoryManager; -import com.google.gerrit.server.git.LocalDiskRepositoryManager; import com.google.gwtorm.client.OrmException; import com.google.gwtorm.client.SchemaFactory; import com.google.inject.Inject; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java index 14717cc229..724d11f2e0 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java @@ -1993,10 +1993,6 @@ public class ReceiveCommits implements PreReceiveHook, PostReceiveHook { return cmd.getRefName().startsWith(Constants.R_HEADS); } - private static boolean isConfig(final Ref ref) { - return ref.getName().equals(GitRepositoryManager.REF_CONFIG); - } - private static boolean isConfig(final ReceiveCommand cmd) { return cmd.getRefName().equals(GitRepositoryManager.REF_CONFIG); } diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/args4j/AccountGroupUUIDHandler.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/args4j/AccountGroupUUIDHandler.java index 583a44d7f9..90b49875c1 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/args4j/AccountGroupUUIDHandler.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/args4j/AccountGroupUUIDHandler.java @@ -29,7 +29,7 @@ import org.kohsuke.args4j.spi.Setter; public class AccountGroupUUIDHandler extends OptionHandler { private final GroupCache groupCache; - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) @Inject public AccountGroupUUIDHandler(final GroupCache groupCache, @Assisted final CmdLineParser parser, @Assisted final OptionDef option,