Commit e04211b6 authored by Liang Ding's avatar Liang Ding

🎨 Clean code

parent 7c440466
...@@ -60,7 +60,7 @@ import java.util.concurrent.locks.ReentrantLock; ...@@ -60,7 +60,7 @@ import java.util.concurrent.locks.ReentrantLock;
* Solo Servlet listener. * Solo Servlet listener.
* *
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.9.3.25, Sep 21, 2017 * @version 1.9.3.26, Dec 6, 2017
* @since 0.3.1 * @since 0.3.1
*/ */
public final class SoloServletListener extends AbstractServletListener { public final class SoloServletListener extends AbstractServletListener {
...@@ -102,6 +102,7 @@ public final class SoloServletListener extends AbstractServletListener { ...@@ -102,6 +102,7 @@ public final class SoloServletListener extends AbstractServletListener {
* Bean manager. * Bean manager.
*/ */
private LatkeBeanManager beanManager; private LatkeBeanManager beanManager;
/** /**
* Request lock. * Request lock.
*/ */
...@@ -129,9 +130,7 @@ public final class SoloServletListener extends AbstractServletListener { ...@@ -129,9 +130,7 @@ public final class SoloServletListener extends AbstractServletListener {
Skins.setDirectoryForTemplateLoading(Option.DefaultPreference.DEFAULT_SKIN_DIR_NAME); Skins.setDirectoryForTemplateLoading(Option.DefaultPreference.DEFAULT_SKIN_DIR_NAME);
final OptionRepository optionRepository = beanManager.getReference(OptionRepositoryImpl.class); final OptionRepository optionRepository = beanManager.getReference(OptionRepositoryImpl.class);
final Transaction transaction = optionRepository.beginTransaction(); final Transaction transaction = optionRepository.beginTransaction();
try { try {
loadPreference(); loadPreference();
...@@ -147,7 +146,6 @@ public final class SoloServletListener extends AbstractServletListener { ...@@ -147,7 +146,6 @@ public final class SoloServletListener extends AbstractServletListener {
registerEventProcessor(); registerEventProcessor();
final PluginManager pluginManager = beanManager.getReference(PluginManager.class); final PluginManager pluginManager = beanManager.getReference(PluginManager.class);
pluginManager.load(); pluginManager.load();
LOGGER.info("Solo is running [" + Latkes.getServePath() + "]"); LOGGER.info("Solo is running [" + Latkes.getServePath() + "]");
...@@ -216,7 +214,6 @@ public final class SoloServletListener extends AbstractServletListener { ...@@ -216,7 +214,6 @@ public final class SoloServletListener extends AbstractServletListener {
/** /**
* Loads preference. * Loads preference.
* <p> * <p>
* <p>
* Loads preference from repository, loads skins from skin directory then sets it into preference if the skins * Loads preference from repository, loads skins from skin directory then sets it into preference if the skins
* changed. * changed.
* </p> * </p>
...@@ -328,8 +325,7 @@ public final class SoloServletListener extends AbstractServletListener { ...@@ -328,8 +325,7 @@ public final class SoloServletListener extends AbstractServletListener {
LOGGER.log(Level.DEBUG, "The request [URI={0}] comes frome mobile device", requestURI); LOGGER.log(Level.DEBUG, "The request [URI={0}] comes frome mobile device", requestURI);
} }
Templates.MAIN_CFG.setServletContextForTemplateLoading(SoloServletListener.getServletContext(), Templates.MAIN_CFG.setServletContextForTemplateLoading(SoloServletListener.getServletContext(), "/skins/" + desiredView);
"/skins/" + desiredView);
httpServletRequest.setAttribute(Keys.TEMAPLTE_DIR_NAME, desiredView); httpServletRequest.setAttribute(Keys.TEMAPLTE_DIR_NAME, desiredView);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.ERROR, "Resolves skin failed", e); LOGGER.log(Level.ERROR, "Resolves skin failed", e);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment