diff --git a/src/main/java/org/bench4q/web/model/CheckBox.java b/src/main/java/org/bench4q/web/model/CheckBox.java index 674a1e10..e360d87e 100644 --- a/src/main/java/org/bench4q/web/model/CheckBox.java +++ b/src/main/java/org/bench4q/web/model/CheckBox.java @@ -2,20 +2,10 @@ package org.bench4q.web.model; public class CheckBox extends ParamTypeModel { - private String rows; - - public String getRows() { - return rows; - } - - public void setRows(String rows) { - this.rows = rows; - } - - public CheckBox(String rows,String type, String valueSeperator, String fieldSeperator) { - super(type, valueSeperator, fieldSeperator); + public CheckBox(String type, String valueSeperator, String fieldSeperator, + int size, String cols, String rows) { + super(type, valueSeperator, fieldSeperator, size, cols, rows); // TODO Auto-generated constructor stub - this.rows=rows; } } diff --git a/src/main/java/org/bench4q/web/model/Field.java b/src/main/java/org/bench4q/web/model/Field.java index bc0adb4d..fa3c559e 100644 --- a/src/main/java/org/bench4q/web/model/Field.java +++ b/src/main/java/org/bench4q/web/model/Field.java @@ -2,21 +2,12 @@ package org.bench4q.web.model; public class Field extends ParamTypeModel{ - private int size; - - public int getSize() { - return size; - } - - public void setSize(int size) { - this.size = size; - } - - public Field(int size,String type, String valueSeperator, String fieldSeperator) { - super(type, valueSeperator, fieldSeperator); + public Field(String type, String valueSeperator, String fieldSeperator, + int size, String cols, String rows) { + super(type, valueSeperator, fieldSeperator, size, cols, rows); // TODO Auto-generated constructor stub - this.size=size; } + } diff --git a/src/main/java/org/bench4q/web/model/MultiField.java b/src/main/java/org/bench4q/web/model/MultiField.java index 6f4733d0..393a7ea1 100644 --- a/src/main/java/org/bench4q/web/model/MultiField.java +++ b/src/main/java/org/bench4q/web/model/MultiField.java @@ -2,20 +2,11 @@ package org.bench4q.web.model; public class MultiField extends ParamTypeModel { - private int size; - - public int getSize() { - return size; - } - - public void setSize(int size) { - this.size = size; - } - - public MultiField(int size,String type, String valueSeperator, String fieldSeperator) { - super(type, valueSeperator, fieldSeperator); + public MultiField(String type, String valueSeperator, + String fieldSeperator, int size, String cols, String rows) { + super(type, valueSeperator, fieldSeperator, size, cols, rows); // TODO Auto-generated constructor stub - this.size=size; } + } diff --git a/src/main/java/org/bench4q/web/model/ParamTypeModel.java b/src/main/java/org/bench4q/web/model/ParamTypeModel.java index 705f50a3..f3068909 100644 --- a/src/main/java/org/bench4q/web/model/ParamTypeModel.java +++ b/src/main/java/org/bench4q/web/model/ParamTypeModel.java @@ -5,12 +5,17 @@ public class ParamTypeModel { private String type; private String valueSeperator; private String fieldSeperator; + private int size; + private String cols; + private String rows; - public ParamTypeModel(String type,String valueSeperator,String fieldSeperator){ + public ParamTypeModel(String type,String valueSeperator,String fieldSeperator,int size,String cols,String rows){ this.type=type; this.valueSeperator=valueSeperator; this.fieldSeperator=fieldSeperator; - + this.size=size; + this.cols=cols; + this.rows=rows; } public String getType() { @@ -37,5 +42,29 @@ public class ParamTypeModel { this.fieldSeperator = fieldSeperator; } + public int getSize() { + return size; + } + + public void setSize(int size) { + this.size = size; + } + + public String getCols() { + return cols; + } + + public void setCols(String cols) { + this.cols = cols; + } + + public String getRows() { + return rows; + } + + public void setRows(String rows) { + this.rows = rows; + } + } diff --git a/src/main/java/org/bench4q/web/model/Table.java b/src/main/java/org/bench4q/web/model/Table.java index 6d339e37..9a317d25 100644 --- a/src/main/java/org/bench4q/web/model/Table.java +++ b/src/main/java/org/bench4q/web/model/Table.java @@ -2,18 +2,12 @@ package org.bench4q.web.model; public class Table extends ParamTypeModel { - private String cols; - public String getCols() { - return cols; - } - public void setCols(String cols) { - this.cols = cols; - } - public Table(String cols,String type, String valueSeperator, String fieldSeperator) { - super(type, valueSeperator, fieldSeperator); + public Table(String type, String valueSeperator, String fieldSeperator, + int size, String cols, String rows) { + super(type, valueSeperator, fieldSeperator, size, cols, rows); // TODO Auto-generated constructor stub - this.cols=cols; } + } diff --git a/src/main/webapp/plugin.jsp b/src/main/webapp/plugin.jsp index b614b75c..a4580a29 100644 --- a/src/main/webapp/plugin.jsp +++ b/src/main/webapp/plugin.jsp @@ -102,9 +102,7 @@ body {
@@ -146,7 +144,7 @@ body {
" + + behaviorData + + "
" + + label + + "
" + label + + "
" + + name + + ":" + + label + + "
" - + label - + "