diff --git a/src/main/java/org/codelibs/fess/crud/form/admin/BsBoostDocumentRuleForm.java b/src/main/java/org/codelibs/fess/crud/form/admin/BsBoostDocumentRuleForm.java deleted file mode 100644 index 6fd27f4c3..000000000 --- a/src/main/java/org/codelibs/fess/crud/form/admin/BsBoostDocumentRuleForm.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright 2009-2015 the CodeLibs Project and the Others. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the specific language - * governing permissions and limitations under the License. - */ - -package org.codelibs.fess.crud.form.admin; - -import java.util.HashMap; -import java.util.Map; - -import org.codelibs.fess.Constants; -import org.seasar.struts.annotation.DateType; -import org.seasar.struts.annotation.IntRange; -import org.seasar.struts.annotation.IntegerType; -import org.seasar.struts.annotation.LongType; -import org.seasar.struts.annotation.Maxbytelength; -import org.seasar.struts.annotation.Required; - -public abstract class BsBoostDocumentRuleForm { - @IntegerType - public String pageNumber; - - public Map searchParams = new HashMap(); - - @IntegerType - public int crudMode; - - public String getCurrentPageNumber() { - return pageNumber; - } - - @Required(target = "confirmfromupdate,update,delete") - @LongType - public String id; - - @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete") - @Maxbytelength(maxbytelength = 4000) - public String urlExpr; - - @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete") - @Maxbytelength(maxbytelength = 4000) - public String boostExpr; - - @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete") - @IntegerType - @IntRange(min = 0, max = 2147483647) - public String sortOrder; - - @Required(target = "confirmfromupdate,update,delete") - @Maxbytelength(maxbytelength = 255) - public String createdBy; - - @Required(target = "confirmfromupdate,update,delete") - @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT) - public String createdTime; - - @Maxbytelength(maxbytelength = 255) - public String updatedBy; - - @DateType - public String updatedTime; - - public String deletedBy; - - @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT) - public String deletedTime; - - @Required(target = "confirmfromupdate,update,delete") - @IntegerType - public String versionNo; - - public void initialize() { - - id = null; - urlExpr = null; - boostExpr = null; - sortOrder = null; - createdBy = null; - createdTime = null; - updatedBy = null; - updatedTime = null; - deletedBy = null; - deletedTime = null; - versionNo = null; - - } - -} diff --git a/src/main/java/org/codelibs/fess/form/admin/BoostDocumentRuleForm.java b/src/main/java/org/codelibs/fess/form/admin/BoostDocumentRuleForm.java index 33440f5c1..066ee6893 100644 --- a/src/main/java/org/codelibs/fess/form/admin/BoostDocumentRuleForm.java +++ b/src/main/java/org/codelibs/fess/form/admin/BoostDocumentRuleForm.java @@ -16,17 +16,85 @@ package org.codelibs.fess.form.admin; -import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; -import org.codelibs.fess.crud.form.admin.BsBoostDocumentRuleForm; +import org.codelibs.fess.Constants; +import org.seasar.struts.annotation.DateType; +import org.seasar.struts.annotation.IntRange; +import org.seasar.struts.annotation.IntegerType; +import org.seasar.struts.annotation.LongType; +import org.seasar.struts.annotation.Maxbytelength; +import org.seasar.struts.annotation.Required; -public class BoostDocumentRuleForm extends BsBoostDocumentRuleForm implements Serializable { +public class BoostDocumentRuleForm { + @IntegerType + public String pageNumber; - private static final long serialVersionUID = 1L; + public Map searchParams = new HashMap(); + + @IntegerType + public int crudMode; + + public String getCurrentPageNumber() { + return pageNumber; + } + + @Required(target = "confirmfromupdate,update,delete") + @LongType + public String id; + + @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete") + @Maxbytelength(maxbytelength = 4000) + public String urlExpr; + + @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete") + @Maxbytelength(maxbytelength = 4000) + public String boostExpr; + + @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete") + @IntegerType + @IntRange(min = 0, max = 2147483647) + public String sortOrder; + + @Required(target = "confirmfromupdate,update,delete") + @Maxbytelength(maxbytelength = 255) + public String createdBy; + + @Required(target = "confirmfromupdate,update,delete") + @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT) + public String createdTime; + + @Maxbytelength(maxbytelength = 255) + public String updatedBy; + + @DateType + public String updatedTime; + + public String deletedBy; + + @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT) + public String deletedTime; + + @Required(target = "confirmfromupdate,update,delete") + @IntegerType + public String versionNo; - @Override public void initialize() { - super.initialize(); + + id = null; + urlExpr = null; + boostExpr = null; + sortOrder = null; + createdBy = null; + createdTime = null; + updatedBy = null; + updatedTime = null; + deletedBy = null; + deletedTime = null; + versionNo = null; + sortOrder = "0"; } + }