Skip to content

Commit bcd2971

Browse files
committed
🎨 Clean code
1 parent 94fc427 commit bcd2971

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

src/main/java/org/b3log/solo/util/Skins.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import java.io.IOException;
4040
import java.io.InputStream;
4141
import java.util.*;
42+
import java.util.stream.Collectors;
4243

4344
/**
4445
* Skin utilities.
@@ -57,7 +58,7 @@ public final class Skins {
5758
/**
5859
* Properties map.
5960
*/
60-
private static final Map<String, Map<String, String>> LANG_MAP = new HashMap<String, Map<String, String>>();
61+
private static final Map<String, Map<String, String>> LANG_MAP = new HashMap<>();
6162

6263
/**
6364
* Private default constructor.
@@ -155,11 +156,10 @@ public static void setDirectoryForTemplateLoading(final String skinDirName) {
155156
* @return a set of skin name, returns an empty set if not found
156157
*/
157158
public static Set<String> getSkinDirNames() {
158-
final ServletContext servletContext = SoloServletListener.getServletContext();
159-
160-
final Set<String> ret = new HashSet<String>();
159+
final Set<String> ret = new HashSet<>();
161160

162-
@SuppressWarnings("unchecked") final Set<String> resourcePaths = servletContext.getResourcePaths("/skins");
161+
final ServletContext servletContext = SoloServletListener.getServletContext();
162+
final Set<String> resourcePaths = servletContext.getResourcePaths("/skins");
163163

164164
for (final String path : resourcePaths) {
165165
final String dirName = path.substring("/skins".length() + 1, path.length() - 1);
@@ -182,8 +182,6 @@ public static Set<String> getSkinDirNames() {
182182
* @return directory name, or {@code "default"} if not found
183183
*/
184184
public static String getSkinDirName(final HttpServletRequest request) {
185-
// https://github.com/b3log/solo/issues/12060
186-
187185
if (Requests.mobileRequest(request)) {
188186
return (String) request.getAttribute(Keys.TEMAPLTE_DIR_NAME); // resolved in listener
189187
}

0 commit comments

Comments
 (0)