major cleanup

This commit is contained in:
Athou
2013-03-21 18:40:09 +01:00
parent 92e1732748
commit 420424d279
41 changed files with 247 additions and 1166 deletions

View File

@@ -1,6 +1,5 @@
package com.commafeed.frontend.utils;
import java.security.Principal;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
@@ -19,9 +18,6 @@ import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.util.io.IOUtils;
import org.apache.wicket.util.template.PackageTextTemplate;
import de.agilecoders.wicket.webjars.request.resource.WebjarsCssResourceReference;
import de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference;
public class WicketUtils {
public static void loadJQuery(IHeaderResponse response) {
@@ -35,12 +31,6 @@ public class WicketUtils {
.getSimpleName() + ".js"));
}
public static JavaScriptHeaderItem buildJavaScriptWebJarHeaderItem(
String name) {
return JavaScriptHeaderItem
.forReference(new WebjarsJavaScriptResourceReference(name));
}
public static void loadJS(IHeaderResponse response, Class<?> klass) {
response.render(buildJavaScriptHeaderItem(klass));
}
@@ -60,20 +50,11 @@ public class WicketUtils {
response.render(result);
}
public static void loadWebJarJS(IHeaderResponse response, String name) {
response.render(buildJavaScriptWebJarHeaderItem(name));
}
public static CssHeaderItem buildCssHeaderItem(Class<?> klass) {
return CssHeaderItem.forReference(new CssResourceReference(klass, klass
.getSimpleName() + ".css"));
}
public static CssHeaderItem buildCssWebJarHeaderItem(String name) {
return CssHeaderItem
.forReference(new WebjarsCssResourceReference(name));
}
public static void loadCSS(IHeaderResponse response, Class<?> klass) {
response.render(buildCssHeaderItem(klass));
}
@@ -93,10 +74,6 @@ public class WicketUtils {
response.render(result);
}
public static void loadWebJarCSS(IHeaderResponse response, String name) {
response.render(buildCssWebJarHeaderItem(name));
}
public static HttpServletRequest getHttpServletRequest() {
ServletWebRequest servletWebRequest = (ServletWebRequest) RequestCycle
.get().getRequest();
@@ -108,28 +85,4 @@ public class WicketUtils {
.getResponse();
return (HttpServletResponse) webResponse.getContainerResponse();
}
public static Principal getPrincipal() {
return getHttpServletRequest().getUserPrincipal();
}
public static String getPrincipalName() {
Principal principal = getPrincipal();
return principal == null ? null : principal.toString();
}
public static boolean isUserInRole(String role) {
return getHttpServletRequest().isUserInRole(role);
}
public static boolean isUserInRoles(String... roles) {
boolean inRoles = true;
for (String role : roles) {
if (!isUserInRole(role)) {
inRoles = false;
break;
}
}
return inRoles;
}
}