();
- JSONObject formData = StructuredForm.get(req);
+ JSONObject formData = req.getSubmittedForm();
JSONArray a = JSONArray.fromObject(formData.get("parameter"));
for (Object o : a) {
diff --git a/core/src/main/java/hudson/model/Project.java b/core/src/main/java/hudson/model/Project.java
index 96eb56d21c..90bae5eec6 100644
--- a/core/src/main/java/hudson/model/Project.java
+++ b/core/src/main/java/hudson/model/Project.java
@@ -1,6 +1,5 @@
package hudson.model;
-import hudson.StructuredForm;
import hudson.Util;
import hudson.model.Descriptor.FormException;
import hudson.tasks.BuildStep;
@@ -158,7 +157,7 @@ public abstract class Project,B extends Build
>
super.submit(req,rsp);
req.setCharacterEncoding("UTF-8");
- JSONObject json = StructuredForm.get(req);
+ JSONObject json = req.getSubmittedForm();
buildWrappers.rebuild(req,json, BuildWrappers.getFor(this), "wrapper");
builders.rebuildHetero(req,json, BuildStep.BUILDERS, "builder");
diff --git a/core/src/main/java/hudson/model/User.java b/core/src/main/java/hudson/model/User.java
index d005c86674..bdce607e17 100644
--- a/core/src/main/java/hudson/model/User.java
+++ b/core/src/main/java/hudson/model/User.java
@@ -3,7 +3,6 @@ package hudson.model;
import com.thoughtworks.xstream.XStream;
import hudson.CopyOnWrite;
import hudson.FeedAdapter;
-import hudson.StructuredForm;
import hudson.Util;
import hudson.XmlFile;
import hudson.model.Descriptor.FormException;
@@ -386,7 +385,7 @@ public class User extends AbstractModelObject implements AccessControlled {
fullName = req.getParameter("fullName");
description = req.getParameter("description");
- JSONObject json = StructuredForm.get(req);
+ JSONObject json = req.getSubmittedForm();
List props = new ArrayList();
int i=0;
diff --git a/core/src/main/java/hudson/scm/SCMS.java b/core/src/main/java/hudson/scm/SCMS.java
index 26dcad219a..1d58c4f031 100644
--- a/core/src/main/java/hudson/scm/SCMS.java
+++ b/core/src/main/java/hudson/scm/SCMS.java
@@ -2,7 +2,6 @@ package hudson.scm;
import hudson.model.Descriptor;
import hudson.model.Descriptor.FormException;
-import hudson.StructuredForm;
import java.util.List;
@@ -34,6 +33,6 @@ public class SCMS {
int scmidx = Integer.parseInt(scm);
SCMDescriptor> d = SCMS.get(scmidx);
d.generation++;
- return d.newInstance(req,StructuredForm.get(req).getJSONObject("scm"));
+ return d.newInstance(req, req.getSubmittedForm().getJSONObject("scm"));
}
}
diff --git a/core/src/main/java/hudson/tasks/Ant.java b/core/src/main/java/hudson/tasks/Ant.java
index f792255d7e..4047e49828 100644
--- a/core/src/main/java/hudson/tasks/Ant.java
+++ b/core/src/main/java/hudson/tasks/Ant.java
@@ -2,7 +2,6 @@ package hudson.tasks;
import hudson.CopyOnWrite;
import hudson.Launcher;
-import hudson.StructuredForm;
import hudson.Util;
import hudson.FilePath;
import hudson.EnvVars;
@@ -263,7 +262,7 @@ public class Ant extends Builder {
public boolean configure(StaplerRequest req) {
installations = req.bindJSONToList(
- AntInstallation.class,StructuredForm.get(req).get("ant")).toArray(new AntInstallation[0]);
+ AntInstallation.class, req.getSubmittedForm().get("ant")).toArray(new AntInstallation[0]);
save();
return true;
}
diff --git a/core/src/main/java/hudson/tasks/Maven.java b/core/src/main/java/hudson/tasks/Maven.java
index b4bd568bd4..88f448ae68 100644
--- a/core/src/main/java/hudson/tasks/Maven.java
+++ b/core/src/main/java/hudson/tasks/Maven.java
@@ -7,7 +7,6 @@ import hudson.Launcher;
import hudson.Launcher.LocalLauncher;
import hudson.Util;
import hudson.EnvVars;
-import hudson.StructuredForm;
import hudson.maven.MavenEmbedder;
import hudson.maven.MavenUtil;
import hudson.maven.RedeployPublisher;
@@ -227,7 +226,7 @@ public class Maven extends Builder {
}
public boolean configure(StaplerRequest req) {
- this.installations = req.bindJSONToList(MavenInstallation.class,StructuredForm.get(req).get("maven"))
+ this.installations = req.bindJSONToList(MavenInstallation.class, req.getSubmittedForm().get("maven"))
.toArray(new MavenInstallation[0]);
save();
return true;