From 58f474dc4dd3db62ab1edd5b8ae63aa744496552 Mon Sep 17 00:00:00 2001 From: Christoph Kutzinski Date: Sun, 30 Oct 2011 14:29:24 +0100 Subject: [PATCH] fixed/suppressed some warnings --- .../java/org/jvnet/hudson/test/ExtractChangeLogParser.java | 2 ++ .../main/java/org/jvnet/hudson/test/ExtractResourceSCM.java | 3 +-- .../org/jvnet/hudson/test/ExtractResourceWithChangesSCM.java | 2 +- .../src/main/java/org/jvnet/hudson/test/FakeChangeLogSCM.java | 4 +--- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/test/src/main/java/org/jvnet/hudson/test/ExtractChangeLogParser.java b/test/src/main/java/org/jvnet/hudson/test/ExtractChangeLogParser.java index 5455efd2e7..a2bd723e6b 100644 --- a/test/src/main/java/org/jvnet/hudson/test/ExtractChangeLogParser.java +++ b/test/src/main/java/org/jvnet/hudson/test/ExtractChangeLogParser.java @@ -44,6 +44,7 @@ import java.util.List; * @author Andrew Bayer */ public class ExtractChangeLogParser extends ChangeLogParser { + @SuppressWarnings("rawtypes") @Override public ExtractChangeLogSet parse(AbstractBuild build, File changeLogFile) throws IOException, SAXException { if (changeLogFile.exists()) { @@ -56,6 +57,7 @@ public class ExtractChangeLogParser extends ChangeLogParser { } } + @SuppressWarnings("rawtypes") public ExtractChangeLogSet parse(AbstractBuild build, InputStream changeLogStream) throws IOException, SAXException { ArrayList changeLog = new ArrayList(); diff --git a/test/src/main/java/org/jvnet/hudson/test/ExtractResourceSCM.java b/test/src/main/java/org/jvnet/hudson/test/ExtractResourceSCM.java index 4ec3a08b15..743eecde22 100644 --- a/test/src/main/java/org/jvnet/hudson/test/ExtractResourceSCM.java +++ b/test/src/main/java/org/jvnet/hudson/test/ExtractResourceSCM.java @@ -30,7 +30,6 @@ import hudson.model.BuildListener; import hudson.scm.NullSCM; import hudson.scm.SCM; import org.apache.commons.io.FileUtils; -import org.apache.commons.io.IOUtils; import java.io.File; import java.io.IOException; @@ -70,7 +69,7 @@ public class ExtractResourceSCM extends NullSCM { } @Override - public boolean checkout(AbstractBuild build, Launcher launcher, FilePath workspace, BuildListener listener, File changeLogFile) throws IOException, InterruptedException { + public boolean checkout(AbstractBuild build, Launcher launcher, FilePath workspace, BuildListener listener, File changeLogFile) throws IOException, InterruptedException { if (workspace.exists()) { listener.getLogger().println("Deleting existing workspace " + workspace.getRemote()); workspace.deleteRecursive(); diff --git a/test/src/main/java/org/jvnet/hudson/test/ExtractResourceWithChangesSCM.java b/test/src/main/java/org/jvnet/hudson/test/ExtractResourceWithChangesSCM.java index 0c581dcb42..f8df93dab4 100644 --- a/test/src/main/java/org/jvnet/hudson/test/ExtractResourceWithChangesSCM.java +++ b/test/src/main/java/org/jvnet/hudson/test/ExtractResourceWithChangesSCM.java @@ -75,7 +75,7 @@ public class ExtractResourceWithChangesSCM extends NullSCM { } @Override - public boolean checkout(AbstractBuild build, Launcher launcher, FilePath workspace, BuildListener listener, File changeLogFile) throws IOException, InterruptedException { + public boolean checkout(AbstractBuild build, Launcher launcher, FilePath workspace, BuildListener listener, File changeLogFile) throws IOException, InterruptedException { if (workspace.exists()) { listener.getLogger().println("Deleting existing workspace " + workspace.getRemote()); workspace.deleteRecursive(); diff --git a/test/src/main/java/org/jvnet/hudson/test/FakeChangeLogSCM.java b/test/src/main/java/org/jvnet/hudson/test/FakeChangeLogSCM.java index cfbeed9702..ad0d2c54ab 100644 --- a/test/src/main/java/org/jvnet/hudson/test/FakeChangeLogSCM.java +++ b/test/src/main/java/org/jvnet/hudson/test/FakeChangeLogSCM.java @@ -26,10 +26,8 @@ package org.jvnet.hudson.test; import hudson.FilePath; import hudson.Launcher; import hudson.model.AbstractBuild; -import hudson.model.AbstractProject; import hudson.model.BuildListener; import hudson.model.InvisibleAction; -import hudson.model.JobProperty; import hudson.model.User; import hudson.scm.ChangeLogParser; import hudson.scm.ChangeLogSet; @@ -39,7 +37,6 @@ import org.xml.sax.SAXException; import java.io.File; import java.io.IOException; -import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -86,6 +83,7 @@ public class FakeChangeLogSCM extends NullSCM { } public static class FakeChangeLogParser extends ChangeLogParser { + @SuppressWarnings("rawtypes") @Override public FakeChangeLogSet parse(AbstractBuild build, File changelogFile) throws IOException, SAXException { return new FakeChangeLogSet(build, build.getAction(ChangelogAction.class).entries);