Title: [40655] trunk/hudson/plugins/thinBackup/src/main/java/org/jvnet/hudson/plugins/thinbackup: * fix validation for foreQuietModeTimeout
- Revision
- 40655
- Author
- alienllama
- Date
- 2012-06-22 02:03:30 -0400 (Fri, 22 Jun 2012)
Log Message
* fix validation for foreQuietModeTimeout
* fix persitance of foreceQuietModeTimeout and waitforIdle properties
Modified Paths
Diff
Modified: trunk/hudson/plugins/thinBackup/src/main/java/org/jvnet/hudson/plugins/thinbackup/ThinBackupMgmtLink.java (40654 => 40655)
--- trunk/hudson/plugins/thinBackup/src/main/java/org/jvnet/hudson/plugins/thinbackup/ThinBackupMgmtLink.java 2012-06-21 13:31:35 UTC (rev 40654)
+++ trunk/hudson/plugins/thinBackup/src/main/java/org/jvnet/hudson/plugins/thinbackup/ThinBackupMgmtLink.java 2012-06-22 06:03:30 UTC (rev 40655)
@@ -124,7 +124,9 @@
@QueryParameter("backupBuildResults") final boolean backupBuildResults,
@QueryParameter("backupBuildArchive") final boolean backupBuildArchive,
@QueryParameter("backupUserContents") final boolean backupUserContents,
- @QueryParameter("backupNextBuildNumber") final boolean backupNextBuildNumber) throws IOException {
+ @QueryParameter("backupNextBuildNumber") final boolean backupNextBuildNumber,
+ @QueryParameter("waitForIdle") final boolean waitForIdle,
+ @QueryParameter("forceQuietModeTimeout") final String forceQuietModeTimeout) throws IOException {
Hudson.getInstance().checkPermission(Hudson.ADMINISTER);
final ThinBackupPluginImpl plugin = ThinBackupPluginImpl.getInstance();
@@ -139,6 +141,8 @@
plugin.setBackupBuildArchive(backupBuildArchive);
plugin.setBackupUserContents(backupUserContents);
plugin.setBackupNextBuildNumber(backupNextBuildNumber);
+ plugin.setWaitForIdle(waitForIdle);
+ plugin.setForceQuietModeTimeout(Integer.parseInt(forceQuietModeTimeout));
plugin.save();
LOGGER.finest("Saving backup settings done.");
rsp.sendRedirect(res.getContextPath() + "/thinBackup");
Modified: trunk/hudson/plugins/thinBackup/src/main/java/org/jvnet/hudson/plugins/thinbackup/ThinBackupPluginImpl.java (40654 => 40655)
--- trunk/hudson/plugins/thinBackup/src/main/java/org/jvnet/hudson/plugins/thinbackup/ThinBackupPluginImpl.java 2012-06-21 13:31:35 UTC (rev 40654)
+++ trunk/hudson/plugins/thinBackup/src/main/java/org/jvnet/hudson/plugins/thinbackup/ThinBackupPluginImpl.java 2012-06-22 06:03:30 UTC (rev 40655)
@@ -220,10 +220,13 @@
}
public FormValidation doCheckForceQuietModeTimeout(final StaplerRequest res, final StaplerResponse rsp,
- @QueryParameter("value") final int timeout) {
- if (timeout < 0)
- return FormValidation.error("Number must be a positive value.");
- else if (timeout > 12 * 60)
+ @QueryParameter("value") final String timeout) {
+ FormValidation validation = FormValidation.validateNonNegativeInteger(timeout);
+ if (!FormValidation.ok().equals(validation))
+ return validation;
+
+ int intTimeout = Integer.parseInt(timeout);
+ if (intTimeout > 12 * 60)
return FormValidation.warning("You choose a very long timeout. The value need to be in minutes.");
else
return FormValidation.ok();
