|
@@ -187,12 +187,22 @@ public class SynonymAction {
|
|
@Token(save = false, validate = true, keep = true)
|
|
@Token(save = false, validate = true, keep = true)
|
|
@Execute(validator = true, input = "edit.jsp")
|
|
@Execute(validator = true, input = "edit.jsp")
|
|
public String confirmfromcreate() {
|
|
public String confirmfromcreate() {
|
|
|
|
+ final String[] newInputs = splitLine(synonymForm.inputs);
|
|
|
|
+ validateSynonymString(newInputs);
|
|
|
|
+ final String[] newOutputs = splitLine(synonymForm.outputs);
|
|
|
|
+ validateSynonymString(newOutputs);
|
|
|
|
+
|
|
return "confirm.jsp";
|
|
return "confirm.jsp";
|
|
}
|
|
}
|
|
|
|
|
|
@Token(save = false, validate = true, keep = true)
|
|
@Token(save = false, validate = true, keep = true)
|
|
@Execute(validator = true, input = "edit.jsp")
|
|
@Execute(validator = true, input = "edit.jsp")
|
|
public String confirmfromupdate() {
|
|
public String confirmfromupdate() {
|
|
|
|
+ final String[] newInputs = splitLine(synonymForm.inputs);
|
|
|
|
+ validateSynonymString(newInputs);
|
|
|
|
+ final String[] newOutputs = splitLine(synonymForm.outputs);
|
|
|
|
+ validateSynonymString(newOutputs);
|
|
|
|
+
|
|
return "confirm.jsp";
|
|
return "confirm.jsp";
|
|
}
|
|
}
|
|
|
|
|
|
@@ -413,13 +423,29 @@ public class SynonymAction {
|
|
}
|
|
}
|
|
|
|
|
|
final String[] newInputs = splitLine(synonymForm.inputs);
|
|
final String[] newInputs = splitLine(synonymForm.inputs);
|
|
|
|
+ validateSynonymString(newInputs);
|
|
synonymItem.setNewInputs(newInputs);
|
|
synonymItem.setNewInputs(newInputs);
|
|
final String[] newOutputs = splitLine(synonymForm.outputs);
|
|
final String[] newOutputs = splitLine(synonymForm.outputs);
|
|
|
|
+ validateSynonymString(newOutputs);
|
|
synonymItem.setNewOutputs(newOutputs);
|
|
synonymItem.setNewOutputs(newOutputs);
|
|
|
|
|
|
return synonymItem;
|
|
return synonymItem;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ private void validateSynonymString(String[] values) {
|
|
|
|
+ if (values.length == 0) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ for (String value : values) {
|
|
|
|
+ if (value.indexOf(",") >= 0) {
|
|
|
|
+ throw new SSCActionMessagesException("errors.invalid_str_is_included", value, ",");
|
|
|
|
+ }
|
|
|
|
+ if (value.indexOf("=>") >= 0) {
|
|
|
|
+ throw new SSCActionMessagesException("errors.invalid_str_is_included", value, "=>");
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
private String[] splitLine(final String value) {
|
|
private String[] splitLine(final String value) {
|
|
if (StringUtil.isBlank(value)) {
|
|
if (StringUtil.isBlank(value)) {
|
|
return StringUtil.EMPTY_STRINGS;
|
|
return StringUtil.EMPTY_STRINGS;
|