0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor migration preview

Browse source
This commit is contained in:
jflute 2015-08-06 00:21:14 +09:00
parent 21d7a09c43
commit a1e0b0860f
3 changed files with 28 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java
View file

@ -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());
}

27
src/main/java/org/codelibs/fess/app/web/base/FessAdminAction.java
View file

@ -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<FessMessages> 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} <br>
* Application Origin Methods:
* <pre>
* <span style="font-size: 130%; color: #553000">[Small Helper]</span>
* o saveInfo() <span style="color: #3F7E5E">// save messages to session</span>
* o write() <span style="color: #3F7E5E">// write text to specified file</span>
* o copyBeanToBean() <span style="color: #3F7E5E">// copy bean to bean by BeanUtil</span>
* o getServletContext() <span style="color: #3F7E5E">// get servlet context</span>
* </pre>
*/
@Override
public void document1_CallableSuperMethod() {
super.document1_CallableSuperMethod();
}
}

44
src/main/java/org/codelibs/fess/app/web/base/FessBaseAction.java
View file

@ -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<FessMessages> validationMessagesLambda) {
FessMessages messages = createMessages();
validationMessagesLambda.message(messages);
sessionManager.info().save(messages);
}
// ===================================================================================
// Document
// ========
/**
* {@inheritDoc} <br>
* Application Origin Methods:
* <pre>
* <span style="font-size: 130%; color: #553000">[Information Message]</span>
* o saveInfo() <span style="color: #3F7E5E">// save messages to session</span>
*
* <span style="font-size: 130%; color: #553000">[Conversion Helper]</span>
* o toDate(exp) <span style="color: #3F7E5E">// convert expression to local date</span>
* o toDateTime(exp) <span style="color: #3F7E5E">// convert expression to local date-time</span>
* o toDispDate(date) <span style="color: #3F7E5E">// convert local date to display expression</span>
* o toDispDateTime(date) <span style="color: #3F7E5E">// convert local date-time to display expression</span>
* </pre>
*/
@Override
public void document1_CallableSuperMethod() {
super.document1_CallableSuperMethod();
}
}