Commit bcd2971f authored by Liang Ding's avatar Liang Ding

🎨 Clean code

parent 94fc4279
...@@ -39,6 +39,7 @@ import javax.servlet.http.HttpServletRequest; ...@@ -39,6 +39,7 @@ import javax.servlet.http.HttpServletRequest;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
/** /**
* Skin utilities. * Skin utilities.
...@@ -57,7 +58,7 @@ public final class Skins { ...@@ -57,7 +58,7 @@ public final class Skins {
/** /**
* Properties map. * Properties map.
*/ */
private static final Map<String, Map<String, String>> LANG_MAP = new HashMap<String, Map<String, String>>(); private static final Map<String, Map<String, String>> LANG_MAP = new HashMap<>();
/** /**
* Private default constructor. * Private default constructor.
...@@ -155,11 +156,10 @@ public final class Skins { ...@@ -155,11 +156,10 @@ public final class Skins {
* @return a set of skin name, returns an empty set if not found * @return a set of skin name, returns an empty set if not found
*/ */
public static Set<String> getSkinDirNames() { public static Set<String> getSkinDirNames() {
final ServletContext servletContext = SoloServletListener.getServletContext(); final Set<String> ret = new HashSet<>();
final Set<String> ret = new HashSet<String>();
@SuppressWarnings("unchecked") final Set<String> resourcePaths = servletContext.getResourcePaths("/skins"); final ServletContext servletContext = SoloServletListener.getServletContext();
final Set<String> resourcePaths = servletContext.getResourcePaths("/skins");
for (final String path : resourcePaths) { for (final String path : resourcePaths) {
final String dirName = path.substring("/skins".length() + 1, path.length() - 1); final String dirName = path.substring("/skins".length() + 1, path.length() - 1);
...@@ -182,8 +182,6 @@ public final class Skins { ...@@ -182,8 +182,6 @@ public final class Skins {
* @return directory name, or {@code "default"} if not found * @return directory name, or {@code "default"} if not found
*/ */
public static String getSkinDirName(final HttpServletRequest request) { public static String getSkinDirName(final HttpServletRequest request) {
// https://github.com/b3log/solo/issues/12060
if (Requests.mobileRequest(request)) { if (Requests.mobileRequest(request)) {
return (String) request.getAttribute(Keys.TEMAPLTE_DIR_NAME); // resolved in listener return (String) request.getAttribute(Keys.TEMAPLTE_DIR_NAME); // resolved in listener
} }
......
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