You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2015/02/18 22:10:57 UTC
svn commit: r1660725 - in /myfaces/tobago/trunk:
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/
tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/
tobago-core/src/test/java/org/apache/myfaces/tobago/webapp/ tobago-th...
Author: lofwyr
Date: Wed Feb 18 21:10:56 2015
New Revision: 1660725
URL: http://svn.apache.org/r1660725
Log:
checkstyle
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/MimeTypeUtils.java
myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/MimeTypeUtilsUnitTest.java
myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterUnitTest.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PageRenderer.java
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/MimeTypeUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/MimeTypeUtils.java?rev=1660725&r1=1660724&r2=1660725&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/MimeTypeUtils.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/MimeTypeUtils.java Wed Feb 18 21:10:56 2015
@@ -26,7 +26,7 @@ import java.util.Map;
public final class MimeTypeUtils {
- private static Map<String, String> ADDITIONAL_MIME_TYPES = null;
+ private static Map<String, String> additionalMimeTypes = null;
private MimeTypeUtils() {
// utils class
@@ -82,16 +82,16 @@ public final class MimeTypeUtils {
final int index = file.lastIndexOf('.');
if (index > -1) {
String extension = file.substring(index + 1);
- return ADDITIONAL_MIME_TYPES.get(extension);
+ return additionalMimeTypes.get(extension);
}
return null;
}
public static void init(ServletContext servletContext) {
- if (ADDITIONAL_MIME_TYPES == null) {
+ if (additionalMimeTypes == null) {
final TobagoConfig tobagoConfig = TobagoConfig.getInstance(servletContext);
- ADDITIONAL_MIME_TYPES = tobagoConfig.getMimeTypes();
+ additionalMimeTypes = tobagoConfig.getMimeTypes();
} else {
throw new IllegalStateException(MimeTypeUtils.class.getSimpleName() + " is already initialized!");
}
Modified: myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/MimeTypeUtilsUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/MimeTypeUtilsUnitTest.java?rev=1660725&r1=1660724&r2=1660725&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/MimeTypeUtilsUnitTest.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/MimeTypeUtilsUnitTest.java Wed Feb 18 21:10:56 2015
@@ -22,9 +22,13 @@ package org.apache.myfaces.tobago.intern
import org.apache.myfaces.tobago.internal.config.AbstractTobagoTestBase;
import org.junit.Assert;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MimeTypeUtilsUnitTest extends AbstractTobagoTestBase {
+ private static final Logger LOG = LoggerFactory.getLogger(MimeTypeUtilsUnitTest.class);
+
public static final int INT = 100000000;
public static final String GIF = "http:///localhost:8080/demo/demo.gif";
@@ -82,6 +86,7 @@ public class MimeTypeUtilsUnitTest exten
Assert.assertEquals("application/vnd.oasis.opendocument.text", MimeTypeUtils.getMimeTypeForFile(ODT));
}
+ @SuppressWarnings("unused")
// @Test
public void testPerformance() {
final long start = System.currentTimeMillis();
@@ -98,7 +103,7 @@ public class MimeTypeUtilsUnitTest exten
MimeTypeUtils.getMimeTypeForFile(WOFF);
MimeTypeUtils.getMimeTypeForFile(UNKNOWN0);
}
- System.out.println("-----------------------> " + (System.currentTimeMillis() - start) + " ms");
+ LOG.info("-----------------------> " + (System.currentTimeMillis() - start) + " ms");
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterUnitTest.java?rev=1660725&r1=1660724&r2=1660725&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterUnitTest.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterUnitTest.java Wed Feb 18 21:10:56 2015
@@ -78,8 +78,9 @@ public class TobagoResponseWriterUnitTes
writer.startElement(HtmlElements.A, null);
writer.writeURIAttribute(HtmlAttributes.HREF, "http://example.org/web?text=äöüÃ", null);
writer.endElement(HtmlElements.A);
- Assert.assertEquals("uri attr tag", "<a href='http://example.org/web?text=%C3%A4%C3%B6%C3%BC%C3%9F'\n></a>",
- stringWriter.toString());
+ Assert.assertEquals("uri attr tag",
+ "<a href='http://example.org/web?text=%C3%A4%C3%B6%C3%BC%C3%9F'\n></a>",
+ stringWriter.toString());
}
@Test
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PageRenderer.java?rev=1660725&r1=1660724&r2=1660725&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PageRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PageRenderer.java Wed Feb 18 21:10:56 2015
@@ -66,7 +66,6 @@ import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
import javax.portlet.MimeResponse;
import javax.portlet.ResourceURL;
-import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;