diff --git a/src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java b/src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java index c5609043a..4d3fbe164 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java @@ -206,7 +206,7 @@ public class AdminDesignAction extends FessAdminAction implements Serializable { logger.error("Failed to delete {}", file.getAbsolutePath()); throwValidationError(messages -> messages.addErrorsFailedToDeleteFile(GLOBAL, form.fileName), toMainHtml()); } - SAStrutsUtil.addSessionMessage("success.delete_file", form.fileName); + saveInfo(messages -> messages.addSuccessDeleteFile(GLOBAL, form.fileName)); return redirect(getClass()); } diff --git a/src/main/java/org/codelibs/fess/app/web/base/FessAdminAction.java b/src/main/java/org/codelibs/fess/app/web/base/FessAdminAction.java index 15dbf9b2e..f5756d943 100644 --- a/src/main/java/org/codelibs/fess/app/web/base/FessAdminAction.java +++ b/src/main/java/org/codelibs/fess/app/web/base/FessAdminAction.java @@ -22,9 +22,11 @@ import javax.servlet.ServletContext; import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.beans.util.CopyOptions; +import org.codelibs.fess.mylasta.action.FessMessages; import org.lastaflute.di.util.LdiFileUtil; import org.lastaflute.web.servlet.session.SessionManager; import org.lastaflute.web.util.LaServletContextUtil; +import org.lastaflute.web.validation.VaMessenger; /** * @author codelibs @@ -41,6 +43,12 @@ public abstract class FessAdminAction extends FessBaseAction { // =================================================================================== // Small Helper // ============ + protected void saveInfo(VaMessenger validationMessagesLambda) { + FessMessages messages = createMessages(); + validationMessagesLambda.message(messages); + sessionManager.info().save(messages); + } + protected void write(String path, byte[] data) { LdiFileUtil.write(path, data); } @@ -52,4 +60,23 @@ public abstract class FessAdminAction extends FessBaseAction { protected ServletContext getServletContext() { return LaServletContextUtil.getServletContext(); } + + // =================================================================================== + // Document + // ======== + /** + * {@inheritDoc}
+ * Application Origin Methods: + *
+     * [Small Helper]
+     * o saveInfo() // save messages to session
+     * o write() // write text to specified file
+     * o copyBeanToBean() // copy bean to bean by BeanUtil
+     * o getServletContext() // get servlet context
+     * 
+ */ + @Override + public void document1_CallableSuperMethod() { + super.document1_CallableSuperMethod(); + } } diff --git a/src/main/java/org/codelibs/fess/app/web/base/FessBaseAction.java b/src/main/java/org/codelibs/fess/app/web/base/FessBaseAction.java index badd0d474..1189db74d 100644 --- a/src/main/java/org/codelibs/fess/app/web/base/FessBaseAction.java +++ b/src/main/java/org/codelibs/fess/app/web/base/FessBaseAction.java @@ -31,11 +31,8 @@ */ package org.codelibs.fess.app.web.base; -import javax.annotation.Resource; - import org.codelibs.fess.mylasta.action.FessHtmlPath; import org.codelibs.fess.mylasta.action.FessMessages; -import org.codelibs.fess.mylasta.direction.FessConfig; import org.dbflute.hook.AccessContext; import org.dbflute.optional.OptionalObject; import org.dbflute.optional.OptionalThing; @@ -46,11 +43,8 @@ import org.lastaflute.web.callback.ActionRuntime; import org.lastaflute.web.login.LoginManager; import org.lastaflute.web.login.UserBean; import org.lastaflute.web.response.ActionResponse; -import org.lastaflute.web.servlet.request.RequestManager; -import org.lastaflute.web.servlet.session.SessionManager; import org.lastaflute.web.validation.ActionValidator; import org.lastaflute.web.validation.LaValidatable; -import org.lastaflute.web.validation.VaMessenger; /** * @author jflute @@ -64,16 +58,6 @@ public abstract class FessBaseAction extends TypicalAction // has several interf /** The application type for FESs, e.g. used by access context. */ protected static final String APP_TYPE = "FES"; // #change_it_first - // =================================================================================== - // Attribute - // ========= - @Resource - private RequestManager requestManager; - @Resource - private SessionManager sessionManager; - @Resource - private FessConfig fessConfig; - // =================================================================================== // Hook // ====== @@ -171,32 +155,4 @@ public abstract class FessBaseAction extends TypicalAction // has several interf public FessMessages createMessages() { // application may call return new FessMessages(); // overriding to change return type to concrete-class } - - protected void saveInfo(VaMessenger validationMessagesLambda) { - FessMessages messages = createMessages(); - validationMessagesLambda.message(messages); - sessionManager.info().save(messages); - } - - // =================================================================================== - // Document - // ======== - /** - * {@inheritDoc}
- * Application Origin Methods: - *
-     * [Information Message]
-     * o saveInfo() // save messages to session
-     * 
-     * [Conversion Helper]
-     * o toDate(exp) // convert expression to local date
-     * o toDateTime(exp) // convert expression to local date-time
-     * o toDispDate(date) // convert local date to display expression
-     * o toDispDateTime(date) // convert local date-time to display expression
-     * 
- */ - @Override - public void document1_CallableSuperMethod() { - super.document1_CallableSuperMethod(); - } }