opendev/gerrit
Code Issues Proposed changes

Fix a number of warnings that have crept in

Browse Source 
Change-Id: Ic0515cf29377907266f051934eaf50dccc4dcc8b
This commit is contained in:
Shawn O. Pearce
2011-06-16 08:52:50 -07:00
parent d839297563
commit dc1f28f00c
15 changed files with 13 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/PermissionRuleEditor.java
View File

@@ -30,9 +30,7 @@ import com.google.gwt.dom.client.SpanElement;
import com.google.gwt.dom.client.Style.Display;
import com.google.gwt.editor.client.Editor;
import com.google.gwt.editor.client.EditorDelegate;
import com.google.gwt.editor.client.IsEditor;
import com.google.gwt.editor.client.ValueAwareEditor;
import com.google.gwt.editor.client.adapters.TakesValueEditor;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.text.shared.Renderer;
import com.google.gwt.uibinder.client.UiBinder;
@@ -43,7 +41,6 @@ import com.google.gwt.user.client.ui.Anchor;
import com.google.gwt.user.client.ui.CheckBox;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.HTMLPanel;
import com.google.gwt.user.client.ui.IntegerBox;
import com.google.gwt.user.client.ui.UIObject;
import com.google.gwt.user.client.ui.ValueListBox;

1
gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectAccessScreen.java
View File

@@ -18,7 +18,6 @@ import com.google.gerrit.client.Gerrit;
import com.google.gerrit.client.rpc.GerritCallback;
import com.google.gerrit.client.rpc.ScreenLoadCallback;
import com.google.gerrit.common.PageLinks;
import com.google.gerrit.common.data.AccessSection;
import com.google.gerrit.common.data.ProjectAccess;
import com.google.gerrit.reviewdb.Project;
import com.google.gwt.core.client.GWT;

1
gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/CommitMessageBlock.java
View File

@@ -18,7 +18,6 @@ import com.google.gerrit.client.Gerrit;
import com.google.gerrit.client.ui.CommentLinkProcessor;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.ScrollPanel;
import com.google.gwtexpui.safehtml.client.SafeHtml;
import com.google.gwtexpui.safehtml.client.SafeHtmlBuilder;

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

@@ -30,25 +30,17 @@ import com.google.gerrit.common.data.PatchSetDetail;
import com.google.gerrit.prettify.client.ClientSideFormatter;
import com.google.gerrit.prettify.common.PrettyFactory;
import com.google.gerrit.reviewdb.AccountDiffPreference;
import com.google.gerrit.reviewdb.Change;
import com.google.gerrit.reviewdb.Patch;
import com.google.gerrit.reviewdb.PatchSet;
import com.google.gwt.core.client.Scheduler;
import com.google.gwt.core.client.Scheduler.ScheduledCommand;
import com.google.gwt.event.dom.client.KeyPressEvent;
import com.google.gwt.event.logical.shared.CloseEvent;
import com.google.gwt.event.logical.shared.CloseHandler;
import com.google.gwt.event.logical.shared.OpenEvent;
import com.google.gwt.event.logical.shared.OpenHandler;
import com.google.gwt.event.logical.shared.ValueChangeEvent;
import com.google.gwt.event.logical.shared.ValueChangeHandler;
import com.google.gwt.event.shared.HandlerRegistration;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.DisclosurePanel;
import com.google.gwt.user.client.ui.FlowPanel;
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwtexpui.globalkey.client.GlobalKey;
import com.google.gwtexpui.globalkey.client.KeyCommand;
import com.google.gwtexpui.globalkey.client.KeyCommandSet;
@@ -96,22 +88,6 @@ public abstract class PatchScreen extends Screen implements
private static PatchSet.Id diffSideA = null;
private static PatchSet.Id diffSideB = null;
private static Boolean historyOpen = null;
private static final OpenHandler<DisclosurePanel> cacheOpenState =
new OpenHandler<DisclosurePanel>() {
@Override
public void onOpen(OpenEvent<DisclosurePanel> event) {
historyOpen = true;
}
};
private static final CloseHandler<DisclosurePanel> cacheCloseState =
new CloseHandler<DisclosurePanel>() {
@Override
public void onClose(CloseEvent<DisclosurePanel> event) {
historyOpen = false;
}
};
/**
* What should be displayed in the top of the screen
*/
@@ -165,9 +141,6 @@ public abstract class PatchScreen extends Screen implements
} else {
diffSideA = null;
}
if (diffSideA == null) {
historyOpen = null;
}
idSideA = diffSideA; // null here means we're diff'ing from the Base
idSideB = diffSideB != null ? diffSideB : id.getParentKey();
@@ -382,8 +355,6 @@ public abstract class PatchScreen extends Screen implements
}
private void onResult(final PatchScript script, final boolean isFirst) {
final Change.Key cid = script.getChangeId();
final String path = PatchTable.getDisplayFileName(patchKey);
String fileName = path;
final int last = fileName.lastIndexOf('/');

3
gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/MorphingTabPanel.java
View File

@@ -16,9 +16,8 @@ package com.google.gerrit.client.ui;
import com.google.gwt.event.logical.shared.SelectionEvent;
import com.google.gwt.event.logical.shared.SelectionHandler;
import com.google.gwt.user.client.ui.Widget;
import com.google.gwt.user.client.ui.TabBar;
import com.google.gwt.user.client.ui.TabPanel;
import com.google.gwt.user.client.ui.Widget;
import java.util.ArrayList;
import java.util.List;

1
gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/SuggestServiceImpl.java
View File

@@ -211,7 +211,6 @@ class SuggestServiceImpl extends BaseServiceImplementation implements
final String b = a + MAX_SUFFIX;
final int max = 10;
final int n = limit <= 0 ? max : Math.min(limit, max);
Set<AccountGroup.UUID> memberOf = currentUser.get().getEffectiveGroups();
List<GroupReference> r = new ArrayList<GroupReference>(n);
for (AccountGroupName group : db.accountGroupNames()
.suggestByName(a, b, n)) {

8
gerrit-server/src/main/java/com/google/gerrit/server/patch/AddReviewer.java
View File

@@ -15,9 +15,9 @@
package com.google.gerrit.server.patch;
import com.google.gerrit.common.data.ReviewerResult;
import com.google.gerrit.common.data.ApprovalType;
import com.google.gerrit.common.data.ApprovalTypes;
import com.google.gerrit.common.data.ReviewerResult;
import com.google.gerrit.reviewdb.Account;
import com.google.gerrit.reviewdb.ApprovalCategory;
import com.google.gerrit.reviewdb.Change;
@@ -32,9 +32,6 @@ import com.google.gwtorm.client.OrmException;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
@@ -43,9 +40,6 @@ import java.util.Set;
import java.util.concurrent.Callable;
public class AddReviewer implements Callable<ReviewerResult> {
private static final Logger log =
LoggerFactory.getLogger(AddReviewer.class);
public interface Factory {
AddReviewer create(Change.Id changeId, Collection<String> nameOrEmails);
}

2
gerrit-server/src/main/java/com/google/gerrit/server/project/ChangeControl.java
View File

@@ -300,7 +300,7 @@ public class ChangeControl {
// choice points once a solution is found.
Term last = results.get(results.size() - 1);
if (last.isStructure() && 1 == last.arity() && "ok".equals(last.name())) {
Term solution = last.arg(0);
// Term solution = last.arg(0);
return CanSubmitResult.OK;
}

1
gerrit-server/src/main/java/com/google/gerrit/server/project/InvalidChangeOperationException.java
View File

@@ -14,7 +14,6 @@
package com.google.gerrit.server.project;
import com.google.gerrit.reviewdb.Change;
/** Indicates the change operation is not currently valid. */
public class InvalidChangeOperationException extends Exception {

2
gerrit-server/src/main/java/gerrit/PRED_$current_user_2.java
View File

@@ -40,6 +40,8 @@ import com.googlecode.prolog_cafe.lang.Term;
* </pre>
*/
class PRED_$current_user_2 extends Predicate.P2 {
private static final long serialVersionUID = 1L;
PRED_$current_user_2(Term a1, Term a2, Operation n) {
arg1 = a1;
arg2 = a2;

2
gerrit-server/src/main/java/gerrit/PRED_$load_commit_labels_1.java
View File

@@ -24,6 +24,8 @@ import com.googlecode.prolog_cafe.lang.Term;
/** Exports list of {@code commit_label( label('Code-Review', 2), user(12345789) )}. */
class PRED_$load_commit_labels_1 extends Predicate.P1 {
private static final long serialVersionUID = 1L;
private static final SymbolTerm sym_commit_label = SymbolTerm.intern("commit_label", 2);
private static final SymbolTerm sym_label = SymbolTerm.intern("label", 2);
private static final SymbolTerm sym_user = SymbolTerm.intern("user", 1);

2
gerrit-server/src/main/java/gerrit/PRED_$user_label_range_4.java
View File

@@ -38,6 +38,8 @@ import com.googlecode.prolog_cafe.lang.Term;
* </pre>
*/
class PRED_$user_label_range_4 extends Predicate.P4 {
private static final long serialVersionUID = 1L;
PRED_$user_label_range_4(Term a1, Term a2, Term a3, Term a4, Operation n) {
arg1 = a1;
arg2 = a2;

2
gerrit-server/src/main/java/gerrit/PRED_get_legacy_approval_types_1.java
View File

@@ -43,6 +43,8 @@ import java.util.List;
* </ul>
*/
class PRED_get_legacy_approval_types_1 extends Predicate.P1 {
private static final long serialVersionUID = 1L;
PRED_get_legacy_approval_types_1(Term a1, Operation n) {
arg1 = a1;
cont = n;

1
gerrit-server/src/test/java/com/google/gerrit/rules/PrologTestCase.java
View File

@@ -30,7 +30,6 @@ import java.io.FileNotFoundException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.EnumSet;
import java.util.List;

3
gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ModifyReviewersCommand.java
View File

@@ -111,7 +111,8 @@ public class ModifyReviewersCommand extends BaseCommand {
}
private boolean modifyOne(Change.Id changeId) throws Exception {
ChangeControl changeControl = changeControlFactory.validateFor(changeId);
changeControlFactory.validateFor(changeId);
ReviewerResult result;
boolean ok = true;