Fix miscellaneous compiler warnings

Remove unused imports, remove unused local variables, parameterize
generic types, suppress warnings.

Change-Id: I8e4867d9a03ff774c1f8e04ff9853b0afb676e69
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
This commit is contained in:
Edwin Kempin
2011-11-03 08:54:22 +01:00
parent 0d957de5d3
commit 0009ace932
13 changed files with 12 additions and 28 deletions

View File

@@ -15,13 +15,7 @@
package gerrit;
import com.google.gerrit.reviewdb.Account;
import com.google.gerrit.reviewdb.PatchSet;
import com.google.gerrit.reviewdb.PatchSetInfo;
import com.google.gerrit.reviewdb.UserIdentity;
import com.google.gerrit.rules.PrologEnvironment;
import com.google.gerrit.rules.StoredValues;
import com.google.gerrit.server.patch.PatchSetInfoFactory;
import com.google.gerrit.server.patch.PatchSetInfoNotAvailableException;
import com.googlecode.prolog_cafe.lang.IntegerTerm;
import com.googlecode.prolog_cafe.lang.Operation;

View File

@@ -15,7 +15,6 @@
package gerrit;
import com.google.gerrit.reviewdb.Patch;
import com.google.gerrit.reviewdb.PatchSetInfo;
import com.google.gerrit.rules.StoredValues;
import com.google.gerrit.server.patch.PatchList;
import com.google.gerrit.server.patch.PatchListEntry;
@@ -80,7 +79,6 @@ public class PRED_commit_delta_4 extends Predicate.P4 {
engine.areg3 = arg3;
engine.areg4 = arg4;
PatchSetInfo psInfo = StoredValues.PATCH_SET_INFO.get(engine);
PatchList pl = StoredValues.PATCH_LIST.get(engine);
Iterator<PatchListEntry> iter = pl.getPatches().iterator();
@@ -99,6 +97,7 @@ public class PRED_commit_delta_4 extends Predicate.P4 {
Term a5 = engine.areg5;
Pattern regex = (Pattern)((JavaObjectTerm)a1).object();
@SuppressWarnings("unchecked")
Iterator<PatchListEntry> iter =
(Iterator<PatchListEntry>)((JavaObjectTerm)a5).object();
while (iter.hasNext()) {
@@ -148,6 +147,7 @@ public class PRED_commit_delta_4 extends Predicate.P4 {
public Operation exec(Prolog engine) {
Term a5 = engine.areg5;
@SuppressWarnings("unchecked")
Iterator<PatchListEntry> iter =
(Iterator<PatchListEntry>)((JavaObjectTerm)a5).object();
if (!iter.hasNext()) {

View File

@@ -14,8 +14,6 @@
package gerrit;
import com.google.gerrit.reviewdb.PatchSetInfo;
import com.google.gerrit.rules.PrologEnvironment;
import com.google.gerrit.rules.StoredValues;
import com.google.gerrit.server.patch.PatchList;
import com.google.gerrit.server.patch.PatchListEntry;
@@ -28,7 +26,6 @@ import com.googlecode.prolog_cafe.lang.PInstantiationException;
import com.googlecode.prolog_cafe.lang.Predicate;
import com.googlecode.prolog_cafe.lang.Prolog;
import com.googlecode.prolog_cafe.lang.PrologException;
import com.googlecode.prolog_cafe.lang.SystemException;
import com.googlecode.prolog_cafe.lang.Term;
import org.eclipse.jgit.diff.Edit;
@@ -75,8 +72,6 @@ public class PRED_commit_edits_2 extends Predicate.P2 {
Pattern fileRegex = getRegexParameter(a1);
Pattern editRegex = getRegexParameter(a2);
PrologEnvironment env = (PrologEnvironment) engine.control;
PatchSetInfo psInfo = StoredValues.PATCH_SET_INFO.get(engine);
PatchList pl = StoredValues.PATCH_LIST.get(engine);
Repository repo = StoredValues.REPOSITORY.get(engine);