39
39
import java .io .IOException ;
40
40
import java .io .InputStream ;
41
41
import java .util .*;
42
+ import java .util .stream .Collectors ;
42
43
43
44
/**
44
45
* Skin utilities.
@@ -57,7 +58,7 @@ public final class Skins {
57
58
/**
58
59
* Properties map.
59
60
*/
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 <>();
61
62
62
63
/**
63
64
* Private default constructor.
@@ -155,11 +156,10 @@ public static void setDirectoryForTemplateLoading(final String skinDirName) {
155
156
* @return a set of skin name, returns an empty set if not found
156
157
*/
157
158
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 <>();
161
160
162
- @ SuppressWarnings ("unchecked" ) final Set <String > resourcePaths = servletContext .getResourcePaths ("/skins" );
161
+ final ServletContext servletContext = SoloServletListener .getServletContext ();
162
+ final Set <String > resourcePaths = servletContext .getResourcePaths ("/skins" );
163
163
164
164
for (final String path : resourcePaths ) {
165
165
final String dirName = path .substring ("/skins" .length () + 1 , path .length () - 1 );
@@ -182,8 +182,6 @@ public static Set<String> getSkinDirNames() {
182
182
* @return directory name, or {@code "default"} if not found
183
183
*/
184
184
public static String getSkinDirName (final HttpServletRequest request ) {
185
- // https://github.com/b3log/solo/issues/12060
186
-
187
185
if (Requests .mobileRequest (request )) {
188
186
return (String ) request .getAttribute (Keys .TEMAPLTE_DIR_NAME ); // resolved in listener
189
187
}
0 commit comments