From 4e620598f38f6bf264bbe8f0a166720151995fb6 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 6 Jan 2011 08:14:35 -0800 Subject: [PATCH] Revert "Removed unused import." This reverts commit becb2768bdfbca3c0fdc247f7579f7f63f33481d. Conflicts: core/src/main/java/hudson/init/InitializerFinder.java core/src/main/java/hudson/matrix/AxisList.java While looking at PollingResult I noticed that import statements used in javadoc are removed. --- core/src/main/java/hudson/WebAppMain.java | 2 ++ core/src/main/java/hudson/console/AnnotatedLargeText.java | 1 + core/src/main/java/hudson/init/InitializerFinder.java | 1 + core/src/main/java/hudson/init/impl/GroovyInitScript.java | 2 ++ core/src/main/java/hudson/logging/LogRecorderManager.java | 1 + core/src/main/java/hudson/matrix/Axis.java | 1 + core/src/main/java/hudson/matrix/AxisList.java | 3 +++ core/src/main/java/hudson/model/Api.java | 1 + core/src/main/java/hudson/model/BooleanParameterValue.java | 1 + core/src/main/java/hudson/model/BuildTimelineWidget.java | 3 +++ .../main/java/hudson/model/ChoiceParameterDefinition.java | 2 ++ core/src/main/java/hudson/model/DownloadService.java | 1 + core/src/main/java/hudson/model/Items.java | 1 + core/src/main/java/hudson/model/Job.java | 2 ++ core/src/main/java/hudson/model/JobParameterValue.java | 1 + core/src/main/java/hudson/model/LoadBalancer.java | 1 + core/src/main/java/hudson/model/ParameterValue.java | 3 +++ core/src/main/java/hudson/model/Result.java | 3 +++ .../src/main/java/hudson/model/RunParameterDefinition.java | 2 ++ core/src/main/java/hudson/model/Saveable.java | 1 + core/src/main/java/hudson/model/StringParameterValue.java | 1 + core/src/main/java/hudson/model/UpdateSite.java | 1 + core/src/main/java/hudson/model/View.java | 1 + core/src/main/java/hudson/model/labels/LabelAtom.java | 1 + .../main/java/hudson/model/labels/LabelAtomProperty.java | 2 ++ core/src/main/java/hudson/model/listeners/RunListener.java | 3 +++ .../main/java/hudson/model/listeners/SaveableListener.java | 2 ++ core/src/main/java/hudson/model/queue/QueueSorter.java | 1 + core/src/main/java/hudson/scm/PollingResult.java | 4 ++++ core/src/main/java/hudson/scm/RepositoryBrowsers.java | 3 +++ core/src/main/java/hudson/scm/SCMRevisionState.java | 4 ++++ core/src/main/java/hudson/scm/SCMS.java | 3 +++ .../java/hudson/security/BasicAuthenticationFilter.java | 3 +++ core/src/main/java/hudson/slaves/ComputerLauncher.java | 7 +++---- .../java/hudson/tasks/BuildStepCompatibilityLayer.java | 2 ++ core/src/main/java/hudson/tasks/BuildTrigger.java | 2 +- core/src/main/java/hudson/triggers/Trigger.java | 1 + core/src/main/java/hudson/triggers/Triggers.java | 2 ++ core/src/main/java/hudson/util/ClasspathBuilder.java | 1 + core/src/main/java/hudson/util/ComboBoxModel.java | 1 + core/src/main/java/hudson/util/CopyOnWriteList.java | 1 + core/src/main/java/hudson/util/FormFieldValidator.java | 1 + core/src/main/java/hudson/util/FormValidation.java | 3 +++ core/src/main/java/hudson/util/ProcessKiller.java | 1 + core/src/main/java/hudson/util/ReflectionUtils.java | 1 + 45 files changed, 80 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/hudson/WebAppMain.java b/core/src/main/java/hudson/WebAppMain.java index a28229533c..cab42133d4 100644 --- a/core/src/main/java/hudson/WebAppMain.java +++ b/core/src/main/java/hudson/WebAppMain.java @@ -25,6 +25,7 @@ package hudson; import com.thoughtworks.xstream.converters.reflection.PureJavaReflectionProvider; import com.thoughtworks.xstream.core.JVM; +import com.sun.jna.Native; import hudson.model.Hudson; import hudson.model.User; import hudson.triggers.SafeTimerTask; @@ -40,6 +41,7 @@ import hudson.util.IncompatibleAntVersionDetected; import hudson.util.HudsonFailedToLoad; import hudson.util.ChartUtil; import hudson.util.AWTProblem; +import hudson.util.JNADoublyLoaded; import org.jvnet.localizer.LocaleProvider; import org.kohsuke.stapler.Stapler; import org.kohsuke.stapler.StaplerRequest; diff --git a/core/src/main/java/hudson/console/AnnotatedLargeText.java b/core/src/main/java/hudson/console/AnnotatedLargeText.java index 79d5df71fb..550f33c8b9 100644 --- a/core/src/main/java/hudson/console/AnnotatedLargeText.java +++ b/core/src/main/java/hudson/console/AnnotatedLargeText.java @@ -45,6 +45,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.OutputStream; +import java.io.OutputStreamWriter; import java.io.Writer; import java.nio.charset.Charset; import java.security.GeneralSecurityException; diff --git a/core/src/main/java/hudson/init/InitializerFinder.java b/core/src/main/java/hudson/init/InitializerFinder.java index 3203e77eac..d228ce8cab 100644 --- a/core/src/main/java/hudson/init/InitializerFinder.java +++ b/core/src/main/java/hudson/init/InitializerFinder.java @@ -40,6 +40,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Set; +import java.util.logging.Level; import java.util.logging.Logger; import hudson.model.Hudson; diff --git a/core/src/main/java/hudson/init/impl/GroovyInitScript.java b/core/src/main/java/hudson/init/impl/GroovyInitScript.java index b8d2907715..e5d37998d1 100644 --- a/core/src/main/java/hudson/init/impl/GroovyInitScript.java +++ b/core/src/main/java/hudson/init/impl/GroovyInitScript.java @@ -31,9 +31,11 @@ import java.io.IOException; import java.net.URL; import java.util.logging.Logger; +import hudson.FilePath; import hudson.model.Hudson; import static hudson.init.InitMilestone.JOB_LOADED; import hudson.init.Initializer; +import org.apache.commons.io.FileUtils; /** * Run the initialization script, if it exists. diff --git a/core/src/main/java/hudson/logging/LogRecorderManager.java b/core/src/main/java/hudson/logging/LogRecorderManager.java index c2f9748176..2b7b68a5f9 100644 --- a/core/src/main/java/hudson/logging/LogRecorderManager.java +++ b/core/src/main/java/hudson/logging/LogRecorderManager.java @@ -30,6 +30,7 @@ import static hudson.init.InitMilestone.PLUGINS_PREPARED; import hudson.model.AbstractModelObject; import hudson.model.Hudson; import hudson.model.RSS; +import hudson.model.Failure; import hudson.tasks.Mailer; import hudson.util.CopyOnWriteMap; import org.apache.commons.io.filefilter.WildcardFileFilter; diff --git a/core/src/main/java/hudson/matrix/Axis.java b/core/src/main/java/hudson/matrix/Axis.java index cd0a3387e1..56b13d7dc3 100644 --- a/core/src/main/java/hudson/matrix/Axis.java +++ b/core/src/main/java/hudson/matrix/Axis.java @@ -27,6 +27,7 @@ import hudson.DescriptorExtensionList; import hudson.ExtensionPoint; import hudson.Util; import hudson.model.AbstractDescribableImpl; +import hudson.model.Descriptor; import hudson.model.Hudson; import hudson.util.QuotedStringTokenizer; import org.kohsuke.stapler.StaplerRequest; diff --git a/core/src/main/java/hudson/matrix/AxisList.java b/core/src/main/java/hudson/matrix/AxisList.java index 79f15cfb63..fd63ae97ea 100644 --- a/core/src/main/java/hudson/matrix/AxisList.java +++ b/core/src/main/java/hudson/matrix/AxisList.java @@ -25,13 +25,16 @@ package hudson.matrix; import com.thoughtworks.xstream.XStream; import hudson.Util; +import hudson.model.Label; import hudson.util.RobustCollectionConverter; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import java.util.HashSet; import java.util.Iterator; import java.util.Arrays; +import java.util.Set; /** * List of {@link Axis}. diff --git a/core/src/main/java/hudson/model/Api.java b/core/src/main/java/hudson/model/Api.java index 053b8228ef..07105dbd33 100644 --- a/core/src/main/java/hudson/model/Api.java +++ b/core/src/main/java/hudson/model/Api.java @@ -44,6 +44,7 @@ import java.io.OutputStream; import java.io.StringReader; import java.io.StringWriter; import java.util.List; +import java.util.logging.Logger; /** * Used to expose remote access API for ".../api/" diff --git a/core/src/main/java/hudson/model/BooleanParameterValue.java b/core/src/main/java/hudson/model/BooleanParameterValue.java index f03caa935e..2acb1d5681 100755 --- a/core/src/main/java/hudson/model/BooleanParameterValue.java +++ b/core/src/main/java/hudson/model/BooleanParameterValue.java @@ -28,6 +28,7 @@ import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.export.Exported; import java.util.Locale; +import java.util.Map; import hudson.util.VariableResolver; diff --git a/core/src/main/java/hudson/model/BuildTimelineWidget.java b/core/src/main/java/hudson/model/BuildTimelineWidget.java index ca1e226893..c191d9f617 100644 --- a/core/src/main/java/hudson/model/BuildTimelineWidget.java +++ b/core/src/main/java/hudson/model/BuildTimelineWidget.java @@ -24,11 +24,14 @@ package hudson.model; import hudson.util.RunList; +import org.kohsuke.stapler.HttpResponse; import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerResponse; import org.koshuke.stapler.simile.timeline.Event; import org.koshuke.stapler.simile.timeline.TimelineEventList; +import javax.servlet.ServletException; import java.io.IOException; import java.util.Date; diff --git a/core/src/main/java/hudson/model/ChoiceParameterDefinition.java b/core/src/main/java/hudson/model/ChoiceParameterDefinition.java index 8227121478..1dae77d6a5 100755 --- a/core/src/main/java/hudson/model/ChoiceParameterDefinition.java +++ b/core/src/main/java/hudson/model/ChoiceParameterDefinition.java @@ -6,10 +6,12 @@ import org.kohsuke.stapler.export.Exported; import org.apache.commons.lang.StringUtils; import net.sf.json.JSONObject; import hudson.Extension; +import hudson.cli.CLICommand; import java.util.ArrayList; import java.util.List; import java.util.Arrays; +import java.io.IOException; /** * @author huybrechts diff --git a/core/src/main/java/hudson/model/DownloadService.java b/core/src/main/java/hudson/model/DownloadService.java index 98817a388b..0e918e1424 100644 --- a/core/src/main/java/hudson/model/DownloadService.java +++ b/core/src/main/java/hudson/model/DownloadService.java @@ -30,6 +30,7 @@ import hudson.util.IOUtils; import hudson.util.QuotedStringTokenizer; import hudson.util.TextFile; import hudson.util.TimeUnit2; +import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.Stapler; import java.io.File; diff --git a/core/src/main/java/hudson/model/Items.java b/core/src/main/java/hudson/model/Items.java index 060a713c4d..38ca188145 100644 --- a/core/src/main/java/hudson/model/Items.java +++ b/core/src/main/java/hudson/model/Items.java @@ -27,6 +27,7 @@ import com.thoughtworks.xstream.XStream; import hudson.XmlFile; import hudson.DescriptorExtensionList; import hudson.Extension; +import hudson.scm.RepositoryBrowser; import hudson.matrix.MatrixProject; import hudson.matrix.MatrixConfiguration; import hudson.matrix.Axis; diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java index 223aec1189..eb82e9e20f 100644 --- a/core/src/main/java/hudson/model/Job.java +++ b/core/src/main/java/hudson/model/Job.java @@ -63,6 +63,8 @@ import java.io.IOException; import java.io.StringWriter; import java.io.PrintWriter; import java.net.URLEncoder; +import java.util.AbstractList; +import java.text.ParseException; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; diff --git a/core/src/main/java/hudson/model/JobParameterValue.java b/core/src/main/java/hudson/model/JobParameterValue.java index f9638e098c..94a9f8ca37 100644 --- a/core/src/main/java/hudson/model/JobParameterValue.java +++ b/core/src/main/java/hudson/model/JobParameterValue.java @@ -27,6 +27,7 @@ import hudson.EnvVars; import org.kohsuke.stapler.DataBoundConstructor; import java.util.Locale; +import java.util.Map; public class JobParameterValue extends ParameterValue { public final Job job; diff --git a/core/src/main/java/hudson/model/LoadBalancer.java b/core/src/main/java/hudson/model/LoadBalancer.java index afd715884f..231b97fa34 100644 --- a/core/src/main/java/hudson/model/LoadBalancer.java +++ b/core/src/main/java/hudson/model/LoadBalancer.java @@ -29,6 +29,7 @@ import hudson.model.queue.MappingWorksheet.ExecutorChunk; import hudson.model.queue.MappingWorksheet.Mapping; import hudson.util.ConsistentHash; import hudson.util.ConsistentHash.Hash; +import hudson.matrix.MatrixConfiguration; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/hudson/model/ParameterValue.java b/core/src/main/java/hudson/model/ParameterValue.java index 622b34458d..57c4c8ac68 100644 --- a/core/src/main/java/hudson/model/ParameterValue.java +++ b/core/src/main/java/hudson/model/ParameterValue.java @@ -26,6 +26,7 @@ package hudson.model; import hudson.EnvVars; import hudson.Util; +import hudson.slaves.OfflineCause; import hudson.tasks.BuildWrapper; import hudson.tasks.Builder; import hudson.util.VariableResolver; @@ -33,7 +34,9 @@ import hudson.util.VariableResolver; import java.io.Serializable; import java.util.Map; +import net.sf.json.JSONObject; +import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.export.Exported; import org.kohsuke.stapler.export.ExportedBean; diff --git a/core/src/main/java/hudson/model/Result.java b/core/src/main/java/hudson/model/Result.java index 676785bc70..9349114b02 100644 --- a/core/src/main/java/hudson/model/Result.java +++ b/core/src/main/java/hudson/model/Result.java @@ -25,6 +25,7 @@ package hudson.model; import com.thoughtworks.xstream.converters.SingleValueConverter; import com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter; +import hudson.Extension; import hudson.cli.declarative.OptionHandlerExtension; import hudson.util.EditDistance; import org.kohsuke.args4j.CmdLineException; @@ -34,6 +35,8 @@ import org.kohsuke.args4j.spi.*; import org.kohsuke.stapler.export.CustomExportedBean; import java.io.Serializable; +import java.net.URI; +import java.net.URISyntaxException; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/hudson/model/RunParameterDefinition.java b/core/src/main/java/hudson/model/RunParameterDefinition.java index b6db202975..decc29a9f4 100644 --- a/core/src/main/java/hudson/model/RunParameterDefinition.java +++ b/core/src/main/java/hudson/model/RunParameterDefinition.java @@ -29,7 +29,9 @@ import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.export.Exported; import hudson.Extension; +import hudson.cli.CLICommand; +import java.io.IOException; public class RunParameterDefinition extends SimpleParameterDefinition { diff --git a/core/src/main/java/hudson/model/Saveable.java b/core/src/main/java/hudson/model/Saveable.java index d4c9450606..71d499c303 100644 --- a/core/src/main/java/hudson/model/Saveable.java +++ b/core/src/main/java/hudson/model/Saveable.java @@ -24,6 +24,7 @@ package hudson.model; import hudson.BulkChange; +import hudson.model.listeners.SaveableListener; import java.io.IOException; /** diff --git a/core/src/main/java/hudson/model/StringParameterValue.java b/core/src/main/java/hudson/model/StringParameterValue.java index c3bf472099..00364d2022 100644 --- a/core/src/main/java/hudson/model/StringParameterValue.java +++ b/core/src/main/java/hudson/model/StringParameterValue.java @@ -28,6 +28,7 @@ import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.export.Exported; import java.util.Locale; +import java.util.Map; import hudson.util.VariableResolver; diff --git a/core/src/main/java/hudson/model/UpdateSite.java b/core/src/main/java/hudson/model/UpdateSite.java index 371e360ad0..b78823fe6b 100644 --- a/core/src/main/java/hudson/model/UpdateSite.java +++ b/core/src/main/java/hudson/model/UpdateSite.java @@ -34,6 +34,7 @@ import hudson.util.TextFile; import hudson.util.VersionNumber; import static hudson.util.TimeUnit2.DAYS; import net.sf.json.JSONObject; +import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; diff --git a/core/src/main/java/hudson/model/View.java b/core/src/main/java/hudson/model/View.java index 67ee3bc46a..f9be250402 100644 --- a/core/src/main/java/hudson/model/View.java +++ b/core/src/main/java/hudson/model/View.java @@ -42,6 +42,7 @@ import hudson.util.RunList; import hudson.widgets.Widget; import java.io.IOException; +import java.text.ParseException; import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; diff --git a/core/src/main/java/hudson/model/labels/LabelAtom.java b/core/src/main/java/hudson/model/labels/LabelAtom.java index 240b4f4036..114434c454 100644 --- a/core/src/main/java/hudson/model/labels/LabelAtom.java +++ b/core/src/main/java/hudson/model/labels/LabelAtom.java @@ -35,6 +35,7 @@ import hudson.model.Descriptor.FormException; import hudson.model.Failure; import hudson.model.Hudson; import hudson.model.Label; +import hudson.model.Messages; import hudson.model.Saveable; import hudson.model.listeners.SaveableListener; import hudson.util.DescribableList; diff --git a/core/src/main/java/hudson/model/labels/LabelAtomProperty.java b/core/src/main/java/hudson/model/labels/LabelAtomProperty.java index 933267d7a9..6515332d48 100644 --- a/core/src/main/java/hudson/model/labels/LabelAtomProperty.java +++ b/core/src/main/java/hudson/model/labels/LabelAtomProperty.java @@ -28,6 +28,8 @@ import hudson.ExtensionPoint; import hudson.model.AbstractDescribableImpl; import hudson.model.Action; import hudson.model.Hudson; +import hudson.slaves.NodeDescriptor; +import hudson.slaves.NodePropertyDescriptor; import org.kohsuke.stapler.export.ExportedBean; import java.util.Collection; diff --git a/core/src/main/java/hudson/model/listeners/RunListener.java b/core/src/main/java/hudson/model/listeners/RunListener.java index 6e0a150e31..5f75e6dc90 100644 --- a/core/src/main/java/hudson/model/listeners/RunListener.java +++ b/core/src/main/java/hudson/model/listeners/RunListener.java @@ -26,9 +26,12 @@ package hudson.model.listeners; import hudson.ExtensionPoint; import hudson.ExtensionListView; import hudson.Extension; +import hudson.DescriptorExtensionList; import hudson.ExtensionList; +import hudson.scm.RepositoryBrowser; import hudson.model.Run; import hudson.model.TaskListener; +import hudson.model.Descriptor; import hudson.model.Hudson; import hudson.util.CopyOnWriteList; import org.jvnet.tiger_types.Types; diff --git a/core/src/main/java/hudson/model/listeners/SaveableListener.java b/core/src/main/java/hudson/model/listeners/SaveableListener.java index 3917a4c77e..37f230d7d4 100644 --- a/core/src/main/java/hudson/model/listeners/SaveableListener.java +++ b/core/src/main/java/hudson/model/listeners/SaveableListener.java @@ -25,11 +25,13 @@ package hudson.model.listeners; import hudson.ExtensionPoint; +import hudson.ExtensionListView; import hudson.Extension; import hudson.ExtensionList; import hudson.XmlFile; import hudson.model.Hudson; import hudson.model.Saveable; +import hudson.util.CopyOnWriteList; /** * Receives notifications about save actions on {@link Saveable} objects in Hudson. diff --git a/core/src/main/java/hudson/model/queue/QueueSorter.java b/core/src/main/java/hudson/model/queue/QueueSorter.java index b689bd6914..00d6e9aa65 100644 --- a/core/src/main/java/hudson/model/queue/QueueSorter.java +++ b/core/src/main/java/hudson/model/queue/QueueSorter.java @@ -4,6 +4,7 @@ import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.init.Initializer; import hudson.model.Hudson; +import hudson.model.LoadBalancer; import hudson.model.Queue; import hudson.model.Queue.BuildableItem; diff --git a/core/src/main/java/hudson/scm/PollingResult.java b/core/src/main/java/hudson/scm/PollingResult.java index 43982732c8..e6b61c34bf 100644 --- a/core/src/main/java/hudson/scm/PollingResult.java +++ b/core/src/main/java/hudson/scm/PollingResult.java @@ -1,5 +1,9 @@ package hudson.scm; +import hudson.model.AbstractProject; +import hudson.model.TaskListener; +import hudson.Launcher; +import hudson.FilePath; import java.io.Serializable; diff --git a/core/src/main/java/hudson/scm/RepositoryBrowsers.java b/core/src/main/java/hudson/scm/RepositoryBrowsers.java index 3c5dd86c0e..3568984230 100644 --- a/core/src/main/java/hudson/scm/RepositoryBrowsers.java +++ b/core/src/main/java/hudson/scm/RepositoryBrowsers.java @@ -24,7 +24,9 @@ package hudson.scm; import hudson.model.Descriptor; +import hudson.model.Hudson; import hudson.model.Descriptor.FormException; +import hudson.scm.browsers.*; import hudson.util.DescriptorList; import hudson.Extension; import org.kohsuke.stapler.StaplerRequest; @@ -33,6 +35,7 @@ import java.util.ArrayList; import java.util.List; import net.sf.json.JSONObject; +import net.sf.json.JSONArray; /** * List of all installed {@link RepositoryBrowsers}. diff --git a/core/src/main/java/hudson/scm/SCMRevisionState.java b/core/src/main/java/hudson/scm/SCMRevisionState.java index 86c2630f38..ebf0a6c8f8 100644 --- a/core/src/main/java/hudson/scm/SCMRevisionState.java +++ b/core/src/main/java/hudson/scm/SCMRevisionState.java @@ -1,7 +1,11 @@ package hudson.scm; +import hudson.FilePath; +import hudson.Launcher; import hudson.model.AbstractBuild; +import hudson.model.AbstractProject; import hudson.model.Action; +import hudson.model.TaskListener; /** * Immutable object that represents revisions of the files in the repository, diff --git a/core/src/main/java/hudson/scm/SCMS.java b/core/src/main/java/hudson/scm/SCMS.java index 351d1b6a47..aec68f43d8 100644 --- a/core/src/main/java/hudson/scm/SCMS.java +++ b/core/src/main/java/hudson/scm/SCMS.java @@ -23,9 +23,12 @@ */ package hudson.scm; +import hudson.model.Descriptor; +import hudson.model.Hudson; import hudson.model.AbstractProject; import hudson.model.Descriptor.FormException; import hudson.util.DescriptorList; +import hudson.DescriptorExtensionList; import hudson.Extension; import java.util.List; diff --git a/core/src/main/java/hudson/security/BasicAuthenticationFilter.java b/core/src/main/java/hudson/security/BasicAuthenticationFilter.java index 3eb5cb17ea..14a0d10550 100644 --- a/core/src/main/java/hudson/security/BasicAuthenticationFilter.java +++ b/core/src/main/java/hudson/security/BasicAuthenticationFilter.java @@ -25,8 +25,11 @@ package hudson.security; import hudson.model.Hudson; import hudson.util.Scrambler; +import org.acegisecurity.Authentication; import org.acegisecurity.GrantedAuthorityImpl; import org.acegisecurity.context.SecurityContextHolder; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerResponse; import javax.servlet.Filter; import javax.servlet.FilterChain; diff --git a/core/src/main/java/hudson/slaves/ComputerLauncher.java b/core/src/main/java/hudson/slaves/ComputerLauncher.java index 9307a5e355..8a12170b10 100644 --- a/core/src/main/java/hudson/slaves/ComputerLauncher.java +++ b/core/src/main/java/hudson/slaves/ComputerLauncher.java @@ -25,15 +25,14 @@ package hudson.slaves; import hudson.ExtensionPoint; import hudson.Extension; -import hudson.model.AbstractDescribableImpl; -import hudson.model.Computer; -import hudson.model.Hudson; -import hudson.model.TaskListener; +import hudson.model.*; import hudson.remoting.Channel; import hudson.util.DescriptorList; import hudson.util.StreamTaskListener; import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; /** * Extension point to allow control over how {@link Computer}s are "launched", diff --git a/core/src/main/java/hudson/tasks/BuildStepCompatibilityLayer.java b/core/src/main/java/hudson/tasks/BuildStepCompatibilityLayer.java index 6850fec53e..e34f677195 100644 --- a/core/src/main/java/hudson/tasks/BuildStepCompatibilityLayer.java +++ b/core/src/main/java/hudson/tasks/BuildStepCompatibilityLayer.java @@ -29,6 +29,8 @@ import hudson.model.Action; import hudson.model.Project; import hudson.model.AbstractBuild; import hudson.model.AbstractProject; +import hudson.model.Run; +import hudson.model.CheckPoint; import hudson.Launcher; import java.io.IOException; diff --git a/core/src/main/java/hudson/tasks/BuildTrigger.java b/core/src/main/java/hudson/tasks/BuildTrigger.java index d53b1ba20f..48e32adee9 100644 --- a/core/src/main/java/hudson/tasks/BuildTrigger.java +++ b/core/src/main/java/hudson/tasks/BuildTrigger.java @@ -37,13 +37,13 @@ import hudson.model.DependencyGraph.Dependency; import hudson.model.Hudson; import hudson.model.Item; import hudson.model.Items; +import hudson.model.Job; import hudson.model.Project; import hudson.model.Result; import hudson.model.Run; import hudson.model.Cause.UpstreamCause; import hudson.model.TaskListener; import hudson.model.listeners.ItemListener; -import hudson.tasks.BuildTrigger.DescriptorImpl.ItemListenerImpl; import hudson.util.FormValidation; import net.sf.json.JSONObject; import org.kohsuke.stapler.DataBoundConstructor; diff --git a/core/src/main/java/hudson/triggers/Trigger.java b/core/src/main/java/hudson/triggers/Trigger.java index c30d56469a..3b59f8baa8 100644 --- a/core/src/main/java/hudson/triggers/Trigger.java +++ b/core/src/main/java/hudson/triggers/Trigger.java @@ -30,6 +30,7 @@ import hudson.ExtensionPoint; import hudson.DescriptorExtensionList; import hudson.Extension; import hudson.init.Initializer; +import hudson.init.InitMilestone; import static hudson.init.InitMilestone.JOB_LOADED; import hudson.model.AbstractProject; import hudson.model.Action; diff --git a/core/src/main/java/hudson/triggers/Triggers.java b/core/src/main/java/hudson/triggers/Triggers.java index 746ced5028..c9a97f85c9 100644 --- a/core/src/main/java/hudson/triggers/Triggers.java +++ b/core/src/main/java/hudson/triggers/Triggers.java @@ -23,11 +23,13 @@ */ package hudson.triggers; +import hudson.model.Descriptor; import hudson.model.Item; import hudson.util.DescriptorList; import hudson.Extension; import java.util.List; +import java.util.ArrayList; /** * List of all installed {@link Trigger}s. diff --git a/core/src/main/java/hudson/util/ClasspathBuilder.java b/core/src/main/java/hudson/util/ClasspathBuilder.java index e8bfafecc2..aaebd69fdf 100644 --- a/core/src/main/java/hudson/util/ClasspathBuilder.java +++ b/core/src/main/java/hudson/util/ClasspathBuilder.java @@ -2,6 +2,7 @@ package hudson.util; import hudson.FilePath; import hudson.Util; +import hudson.remoting.Channel; import hudson.remoting.Which; import java.io.Serializable; diff --git a/core/src/main/java/hudson/util/ComboBoxModel.java b/core/src/main/java/hudson/util/ComboBoxModel.java index 60e7ccda0c..6bcbc86d3f 100644 --- a/core/src/main/java/hudson/util/ComboBoxModel.java +++ b/core/src/main/java/hudson/util/ComboBoxModel.java @@ -33,6 +33,7 @@ import javax.servlet.ServletException; import java.io.IOException; import java.io.PrintWriter; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import static java.util.Arrays.asList; diff --git a/core/src/main/java/hudson/util/CopyOnWriteList.java b/core/src/main/java/hudson/util/CopyOnWriteList.java index 2bffc09f66..7cee5824eb 100644 --- a/core/src/main/java/hudson/util/CopyOnWriteList.java +++ b/core/src/main/java/hudson/util/CopyOnWriteList.java @@ -38,6 +38,7 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.Arrays; +import java.util.logging.Level; import java.util.logging.Logger; import static java.util.logging.Level.WARNING; diff --git a/core/src/main/java/hudson/util/FormFieldValidator.java b/core/src/main/java/hudson/util/FormFieldValidator.java index 61ca85b611..67a02b58bf 100644 --- a/core/src/main/java/hudson/util/FormFieldValidator.java +++ b/core/src/main/java/hudson/util/FormFieldValidator.java @@ -28,6 +28,7 @@ import hudson.EnvVars; import hudson.FilePath; import hudson.ProxyConfiguration; import hudson.Util; +import hudson.tasks.JavadocArchiver; import hudson.model.AbstractProject; import hudson.model.Hudson; import hudson.model.Item; diff --git a/core/src/main/java/hudson/util/FormValidation.java b/core/src/main/java/hudson/util/FormValidation.java index 6ac2a63a8c..37cce955cc 100644 --- a/core/src/main/java/hudson/util/FormValidation.java +++ b/core/src/main/java/hudson/util/FormValidation.java @@ -25,9 +25,12 @@ package hudson.util; import hudson.EnvVars; import hudson.Functions; +import hudson.Launcher; import hudson.ProxyConfiguration; import hudson.Util; import hudson.FilePath; +import hudson.model.AbstractBuild; +import hudson.model.BuildListener; import hudson.tasks.Builder; import static hudson.Util.fixEmpty; import hudson.model.Hudson; diff --git a/core/src/main/java/hudson/util/ProcessKiller.java b/core/src/main/java/hudson/util/ProcessKiller.java index 5d2e9ad9b0..62a1285caa 100644 --- a/core/src/main/java/hudson/util/ProcessKiller.java +++ b/core/src/main/java/hudson/util/ProcessKiller.java @@ -27,6 +27,7 @@ package hudson.util; import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.model.Hudson; +import hudson.util.ProcessTree.OSProcess; import java.io.IOException; import java.io.Serializable; diff --git a/core/src/main/java/hudson/util/ReflectionUtils.java b/core/src/main/java/hudson/util/ReflectionUtils.java index fb914acf53..854bf2751b 100644 --- a/core/src/main/java/hudson/util/ReflectionUtils.java +++ b/core/src/main/java/hudson/util/ReflectionUtils.java @@ -28,6 +28,7 @@ import org.kohsuke.stapler.ClassDescriptor; import java.beans.PropertyDescriptor; import java.lang.annotation.Annotation; +import java.lang.reflect.Array; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method;