Author: scottbw
Date: Mon Feb 14 11:38:10 2011
New Revision: 1070451
URL: http://svn.apache.org/viewvc?rev=1070451&view=rev
Log:
Code tidying: removed unused import statements and @suppressWarning annotations
Modified:
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/I18n.java
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/PackagingAndConfiguration.java
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/LocalizationUtils.java
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/WidgetPackageUtils.java
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/conformance/PackagingAndConfiguration.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/JCRPersistenceManager.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/PreferenceImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/SharedDataImpl.java
incubator/wookie/trunk/src/org/apache/wookie/feature/FeatureLoader.java
incubator/wookie/trunk/src/org/apache/wookie/util/html/HtmlSerializer.java
incubator/wookie/trunk/src/org/apache/wookie/util/opensocial/OpenSocialUtils.java
Modified:
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/I18n.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/I18n.java?rev=1070451&r1=1070450&r2=1070451&view=diff
==============================================================================
---
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/I18n.java
(original)
+++
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/I18n.java
Mon Feb 14 11:38:10 2011
@@ -21,7 +21,6 @@ import java.net.URL;
import org.apache.wookie.w3c.IContentEntity;
import org.apache.wookie.w3c.IFeatureEntity;
import org.apache.wookie.w3c.W3CWidget;
-import org.junit.Ignore;
import org.junit.Test;
/**
Modified:
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/PackagingAndConfiguration.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/PackagingAndConfiguration.java?rev=1070451&r1=1070450&r2=1070451&view=diff
==============================================================================
---
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/PackagingAndConfiguration.java
(original)
+++
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/PackagingAndConfiguration.java
Mon Feb 14 11:38:10 2011
@@ -20,8 +20,6 @@ import static org.junit.Assert.assertNul
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import java.io.File;
-import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.List;
@@ -35,13 +33,10 @@ import org.apache.wookie.w3c.INameEntity
import org.apache.wookie.w3c.IParamEntity;
import org.apache.wookie.w3c.IPreferenceEntity;
import org.apache.wookie.w3c.W3CWidget;
-import org.apache.wookie.w3c.W3CWidgetFactory;
import org.apache.wookie.w3c.exceptions.BadManifestException;
import org.apache.wookie.w3c.exceptions.BadWidgetZipFileException;
import org.apache.wookie.w3c.exceptions.InvalidContentTypeException;
import org.apache.wookie.w3c.util.LocalizationUtils;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
@@ -1160,7 +1155,7 @@ public class PackagingAndConfiguration e
W3CWidget widget =
processWidgetNoErrors("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-FAFYMEGELU/001/bk.wgt";);
assertEquals("locales/en/icon.png",getIcon(widget));
}
- @SuppressWarnings("unchecked")
+
@Test
public void bl(){
W3CWidget widget =
processWidgetNoErrors("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-FAFYMEGELU/002/bl.wgt";);
@@ -1170,7 +1165,7 @@ public class PackagingAndConfiguration e
String icon2 = getLocalIconPath(widget,1);
assertTrue((icon1.equals("locales/en/icon.jpg") &&
(icon2.equals("icon.png"))) || (icon2.equals("locales/en/icon.jpg") &&
(icon1.equals("icon.png"))));
}
- @SuppressWarnings("unchecked")
+
@Test
public void bm(){
W3CWidget widget =
processWidgetNoErrors("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-FAFYMEGELU/003/bm.wgt";);
@@ -1181,7 +1176,7 @@ public class PackagingAndConfiguration e
assertTrue((icon1.equals("locales/en/icon.jpg") &&
(icon2.equals("icon.png"))) || (icon2.equals("locales/en/icon.jpg") &&
(icon1.equals("icon.png"))));
}
- @SuppressWarnings("unchecked")
+
@Test
public void bn(){
W3CWidget widget =
processWidgetNoErrors("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-FAFYMEGELU/004/bn.wgt";);
@@ -1191,7 +1186,7 @@ public class PackagingAndConfiguration e
String icon2 = getLocalIconPath(widget,1);
assertTrue((icon1.equals("locales/en/icon.png") &&
(icon2.equals("icons/pass.png"))) || (icon2.equals("locales/en/icon.png") &&
(icon1.equals("icons/pass.png"))));
}
- @SuppressWarnings("unchecked")
+
@Test
public void bo(){
W3CWidget widget =
processWidgetNoErrors("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-FAFYMEGELU/005/bo.wgt";);
@@ -1201,7 +1196,7 @@ public class PackagingAndConfiguration e
String icon2 = getLocalIconPath(widget,1);
assertTrue((icon1.equals("icon.jpg") &&
(icon2.equals("icon.png"))) || (icon2.equals("icon.jpg") &&
(icon1.equals("icon.png"))));
}
- @SuppressWarnings("unchecked")
+
@Test
public void bp(){
// Note the original test case is in error here
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=1070451&r1=1070450&r2=1070451&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
Mon Feb 14 11:38:10 2011
@@ -15,7 +15,6 @@ package org.apache.wookie.w3c.util;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collection;
import java.util.Comparator;
import java.util.List;
Modified:
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/WidgetPackageUtils.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/WidgetPackageUtils.java?rev=1070451&r1=1070450&r2=1070451&view=diff
==============================================================================
---
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/WidgetPackageUtils.java
(original)
+++
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/WidgetPackageUtils.java
Mon Feb 14 11:38:10 2011
@@ -210,7 +210,6 @@ public class WidgetPackageUtils {
* @param targetFolder the folder into which to unpack the Zip file
* @throws IOException
*/
- @SuppressWarnings("unchecked")
public static void unpackZip(ZipFile zipfile, File targetFolder) throws
IOException {
targetFolder.mkdirs();
BufferedOutputStream out = null;
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=1070451&r1=1070450&r2=1070451&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
Mon Feb 14 11:38:10 2011
@@ -1114,7 +1114,7 @@ public class PackagingAndConfiguration e
Element widget =
processWidgetNoErrors("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-FAFYMEGELU/001/bk.wgt";);
assertEquals("locales/en/icon.png",getIcon(widget));
}
- @SuppressWarnings("unchecked")
+
@Test
public void bl(){
Element widget =
processWidgetNoErrors("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-FAFYMEGELU/002/bl.wgt";);
@@ -1124,7 +1124,7 @@ public class PackagingAndConfiguration e
String icon2 =
getLocalIconPath(widget,((Element)icons.get(1)));
assertTrue((icon1.equals("locales/en/icon.jpg") &&
(icon2.equals("icon.png"))) || (icon2.equals("locales/en/icon.jpg") &&
(icon1.equals("icon.png"))));
}
- @SuppressWarnings("unchecked")
+
@Test
public void bm(){
Element widget =
processWidgetNoErrors("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-FAFYMEGELU/003/bm.wgt";);
@@ -1135,7 +1135,7 @@ public class PackagingAndConfiguration e
assertTrue((icon1.equals("locales/en/icon.jpg") &&
(icon2.equals("icon.png"))) || (icon2.equals("locales/en/icon.jpg") &&
(icon1.equals("icon.png"))));
}
- @SuppressWarnings("unchecked")
+
@Test
@Ignore
public void bn(){
@@ -1147,7 +1147,7 @@ public class PackagingAndConfiguration e
assertTrue((icon1.equals("locales/en/icon.jpg") &&
(icon2.equals("icons/pass.png"))) || (icon2.equals("locales/en/icon.jpg") &&
(icon1.equals("icons/pass.png"))));
}
- @SuppressWarnings("unchecked")
+
@Test
public void bo(){
Element widget =
processWidgetNoErrors("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-FAFYMEGELU/005/bo.wgt";);
@@ -1158,7 +1158,7 @@ public class PackagingAndConfiguration e
assertTrue((icon1.equals("icon.png") &&
(icon2.equals("icon.jpg"))) || (icon2.equals("icon.jpg") &&
(icon1.equals("icon.png"))));
}
- @SuppressWarnings("unchecked")
+
@Test
public void bp(){
// Note the original test case is in error here
Modified:
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/JCRPersistenceManager.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/JCRPersistenceManager.java?rev=1070451&r1=1070450&r2=1070451&view=diff
==============================================================================
---
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/JCRPersistenceManager.java
(original)
+++
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/JCRPersistenceManager.java
Mon Feb 14 11:38:10 2011
@@ -156,7 +156,7 @@ public class JCRPersistenceManager imple
IMPLEMENTATION_FIELD_MAP.put("widget", "widgetImpl");
}
- @SuppressWarnings("unchecked")
+
private static final List<Class> CLASS_LIST = new
ArrayList<Class>(INTERFACE_TO_CLASS_MAP.values());
private static String repositoryUser;
Modified:
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/PreferenceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/PreferenceImpl.java?rev=1070451&r1=1070450&r2=1070451&view=diff
==============================================================================
---
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/PreferenceImpl.java
(original)
+++
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/PreferenceImpl.java
Mon Feb 14 11:38:10 2011
@@ -45,7 +45,6 @@ public class PreferenceImpl implements I
@Id
@GeneratedValue(strategy=GenerationType.AUTO)
@Column(name="id", nullable=false)
- @SuppressWarnings("unused")
private int id;
@Version
Modified:
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/SharedDataImpl.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/SharedDataImpl.java?rev=1070451&r1=1070450&r2=1070451&view=diff
==============================================================================
---
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/SharedDataImpl.java
(original)
+++
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/SharedDataImpl.java
Mon Feb 14 11:38:10 2011
@@ -42,7 +42,6 @@ public class SharedDataImpl implements I
@Id
@GeneratedValue(strategy=GenerationType.AUTO)
@Column(name="id", nullable=false)
- @SuppressWarnings("unused")
private int id;
@Version
Modified:
incubator/wookie/trunk/src/org/apache/wookie/feature/FeatureLoader.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/feature/FeatureLoader.java?rev=1070451&r1=1070450&r2=1070451&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/feature/FeatureLoader.java
(original)
+++ incubator/wookie/trunk/src/org/apache/wookie/feature/FeatureLoader.java Mon
Feb 14 11:38:10 2011
@@ -35,7 +35,6 @@ public class FeatureLoader {
* Loads features based on the properties configuration supplied
* @param config
*/
- @SuppressWarnings("unchecked")
public static void loadFeatures(PropertiesConfiguration config){
IPersistenceManager persistenceManager =
PersistenceManagerFactory.getPersistenceManager();
persistenceManager.begin();
@@ -83,7 +82,6 @@ public class FeatureLoader {
* @param name the name of the feature, which must be a valid IRI
* @param klass the Class name of the feature, which must implement the
IFeature interface
*/
- @SuppressWarnings("unchecked")
public static void validateFeature(String name, String klass) throws
Exception{
// Are required parameters missing?
if (name == null || klass == null){
Modified:
incubator/wookie/trunk/src/org/apache/wookie/util/html/HtmlSerializer.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/util/html/HtmlSerializer.java?rev=1070451&r1=1070450&r2=1070451&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/util/html/HtmlSerializer.java
(original)
+++ incubator/wookie/trunk/src/org/apache/wookie/util/html/HtmlSerializer.java
Mon Feb 14 11:38:10 2011
@@ -106,7 +106,6 @@ public class HtmlSerializer extends XmlS
* This is exactly the same as SimpleXmlSerializer.serialize, however
we have to include it here as it would
* inherit from XmlSerializer and miss out our custom
dontEscapeAttribute method
*/
- @SuppressWarnings("unchecked")
@Override
protected void serialize(TagNode tagNode, Writer writer) throws
IOException {
serializeOpenTag(tagNode, writer, false);
Modified:
incubator/wookie/trunk/src/org/apache/wookie/util/opensocial/OpenSocialUtils.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/util/opensocial/OpenSocialUtils.java?rev=1070451&r1=1070450&r2=1070451&view=diff
==============================================================================
---
incubator/wookie/trunk/src/org/apache/wookie/util/opensocial/OpenSocialUtils.java
(original)
+++
incubator/wookie/trunk/src/org/apache/wookie/util/opensocial/OpenSocialUtils.java
Mon Feb 14 11:38:10 2011
@@ -15,7 +15,6 @@
package org.apache.wookie.util.opensocial;
import java.net.URLEncoder;
-import java.util.Collection;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
@@ -24,7 +23,6 @@ import org.apache.shindig.common.crypto.
import org.apache.wookie.Messages;
import org.apache.wookie.beans.IStartFile;
import org.apache.wookie.beans.IWidgetInstance;
-import org.apache.wookie.w3c.ILocalizedElement;
import org.apache.wookie.w3c.util.LocalizationUtils;
/**
