Author: scottbw
Date: Fri Nov 11 17:17:36 2011
New Revision: 1200969
URL: http://svn.apache.org/viewvc?rev=1200969&view=rev
Log:
Some misc small bits of code cleanup
Modified:
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/W3CWidgetFactoryTest.java
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/LocalizationUtils.java
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/conformance/PackagingAndConfiguration.java
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/functional/WidgetsControllerTest.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/JPAPersistenceManager.java
Modified:
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/W3CWidgetFactoryTest.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/W3CWidgetFactoryTest.java?rev=1200969&r1=1200968&r2=1200969&view=diff
==============================================================================
---
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/W3CWidgetFactoryTest.java
(original)
+++
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/W3CWidgetFactoryTest.java
Fri Nov 11 17:17:36 2011
@@ -21,7 +21,6 @@ import java.io.File;
import java.io.IOException;
import org.apache.commons.io.FileUtils;
-import org.apache.wookie.w3c.W3CWidget;
import org.apache.wookie.w3c.W3CWidgetFactory;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -134,7 +133,7 @@ public class W3CWidgetFactoryTest {
W3CWidgetFactory fac = new W3CWidgetFactory();
fac.setLocales(new String[]{"en"});
fac.setOutputDirectory(testfolder.getPath());
- W3CWidget widget = fac.parse(wgt);
+ fac.parse(wgt);
}
@Test
Modified:
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/LocalizationUtils.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/LocalizationUtils.java?rev=1200969&r1=1200968&r2=1200969&view=diff
==============================================================================
---
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/LocalizationUtils.java
(original)
+++
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/LocalizationUtils.java
Fri Nov 11 17:17:36 2011
@@ -187,7 +187,6 @@ public class LocalizationUtils {
* @param locales
* @return the sorted list of ULocale instances
*/
- @SuppressWarnings("unchecked")
public static List<ULocale> getProcessedLocaleList(String[] locales){
if (locales == null) return getDefaultLocaleList();
GlobalizationPreferences prefs = new GlobalizationPreferences();
@@ -216,7 +215,6 @@ public class LocalizationUtils {
* Gets the default locales list
* @return a list of ULocale instances for the default locale
*/
- @SuppressWarnings("unchecked")
protected static List<ULocale> getDefaultLocaleList(){
GlobalizationPreferences prefs = new GlobalizationPreferences();
return prefs.getLocales();
Modified:
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/conformance/PackagingAndConfiguration.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src-tests/org/apache/wookie/tests/conformance/PackagingAndConfiguration.java?rev=1200969&r1=1200968&r2=1200969&view=diff
==============================================================================
---
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/conformance/PackagingAndConfiguration.java
(original)
+++
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/conformance/PackagingAndConfiguration.java
Fri Nov 11 17:17:36 2011
@@ -1225,9 +1225,8 @@ public class PackagingAndConfiguration e
String charset = get.getRequestCharSet();
//
+ // Check for charset overrides in the HTML start page
//
- //
- String body = get.getResponseBodyAsString();
HtmlCleaner cleaner = new HtmlCleaner();
TagNode httpEquivNode =
cleaner.clean(get.getResponseBodyAsStream()).findElementByAttValue("http-equiv",
"content-type", true, false);
Modified:
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/functional/WidgetsControllerTest.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src-tests/org/apache/wookie/tests/functional/WidgetsControllerTest.java?rev=1200969&r1=1200968&r2=1200969&view=diff
==============================================================================
---
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/functional/WidgetsControllerTest.java
(original)
+++
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/functional/WidgetsControllerTest.java
Fri Nov 11 17:17:36 2011
@@ -17,7 +17,6 @@ package org.apache.wookie.tests.function
import static org.junit.Assert.*;
import java.io.File;
-import java.io.FileNotFoundException;
import java.io.IOException;
import org.apache.commons.httpclient.HttpClient;
Modified:
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/JPAPersistenceManager.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/JPAPersistenceManager.java?rev=1200969&r1=1200968&r2=1200969&view=diff
==============================================================================
---
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/JPAPersistenceManager.java
(original)
+++
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/JPAPersistenceManager.java
Fri Nov 11 17:17:36 2011
@@ -14,7 +14,6 @@
package org.apache.wookie.beans.jpa;
-import java.io.File;
import java.io.InputStream;
import java.lang.reflect.Array;
import java.sql.Connection;
