You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2006/08/21 18:28:18 UTC
svn commit: r433278 - in /tapestry/tapestry5/tapestry-core/trunk/src:
main/java/org/apache/tapestry/internal/ioc/
main/java/org/apache/tapestry/internal/ioc/services/
main/java/org/apache/tapestry/ioc/services/
main/java/org/apache/tapestry/transform/ ...
Author: hlship
Date: Mon Aug 21 09:28:17 2006
New Revision: 433278
URL: http://svn.apache.org/viewvc?rev=433278&view=rev
Log:
Fix a number of minor warnings.
Modified:
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/ioc/ValidatingConfigurationWrapper.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/ioc/services/ClassFactoryClassLoader.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/ioc/services/ClassFactoryClassPool.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/services/MethodSignature.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/transform/MethodSignature.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/IdAllocator.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/dom/DOMTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ioc/ValidatingConfigurationWrapperTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ioc/ValidatingOrderedConfigurationWrapperTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ioc/services/PipelineBuilderImplTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/parser/TemplateParserImplTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/MarkupWriterImplTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/ComponentInstantiatorSourceImplTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/pages/ClaimedFields.java
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/ioc/ValidatingConfigurationWrapper.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/ioc/ValidatingConfigurationWrapper.java?rev=433278&r1=433277&r2=433278&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/ioc/ValidatingConfigurationWrapper.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/ioc/ValidatingConfigurationWrapper.java Mon Aug 21 09:28:17 2006
@@ -32,14 +32,14 @@
private final Log _log;
- private final Configuration _delegate;
+ private final Configuration<T> _delegate;
private final Class _expectedType;
// Need a strategy for determing the right order for this mass of parameters!
public ValidatingConfigurationWrapper(String serviceId, Log log, Class expectedType,
- ContributionDef contributionDef, Configuration delegate)
+ ContributionDef contributionDef, Configuration<T> delegate)
{
_serviceId = serviceId;
_log = log;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/ioc/services/ClassFactoryClassLoader.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/ioc/services/ClassFactoryClassLoader.java?rev=433278&r1=433277&r2=433278&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/ioc/services/ClassFactoryClassLoader.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/ioc/services/ClassFactoryClassLoader.java Mon Aug 21 09:28:17 2006
@@ -40,7 +40,8 @@
/**
* Searches each of the delegate class loaders for the given class.
*/
- protected synchronized Class findClass(String name) throws ClassNotFoundException
+ @Override
+ protected synchronized Class<?> findClass(String name) throws ClassNotFoundException
{
ClassNotFoundException cnfex = null;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/ioc/services/ClassFactoryClassPool.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/ioc/services/ClassFactoryClassPool.java?rev=433278&r1=433277&r2=433278&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/ioc/services/ClassFactoryClassPool.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/ioc/services/ClassFactoryClassPool.java Mon Aug 21 09:28:17 2006
@@ -76,6 +76,7 @@
* be the delegating ClassFactoryClassLoader, which has visibility to all class loaders for all
* modules.
*/
+ @Override
public synchronized Class toClass(CtClass ctClass) throws CannotCompileException
{
return ctClass.toClass(_loader);
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/services/MethodSignature.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/services/MethodSignature.java?rev=433278&r1=433277&r2=433278&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/services/MethodSignature.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/services/MethodSignature.java Mon Aug 21 09:28:17 2006
@@ -99,6 +99,7 @@
return _returnType;
}
+ @Override
public int hashCode()
{
if (_hashCode == -1)
@@ -128,6 +129,7 @@
*
* @see #isOverridingSignatureOf(MethodSignature)
*/
+ @Override
public boolean equals(Object o)
{
if (o == null || !(o instanceof MethodSignature))
@@ -167,6 +169,7 @@
return false;
}
+ @Override
public String toString()
{
StringBuffer buffer = new StringBuffer();
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/transform/MethodSignature.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/transform/MethodSignature.java?rev=433278&r1=433277&r2=433278&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/transform/MethodSignature.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/transform/MethodSignature.java Mon Aug 21 09:28:17 2006
@@ -116,6 +116,7 @@
return _returnType;
}
+ @Override
public int hashCode()
{
if (_hashCode == -1)
@@ -138,6 +139,7 @@
return _hashCode;
}
+ @Override
public boolean equals(Object other)
{
if (other == null || !(other instanceof MethodSignature))
@@ -165,6 +167,7 @@
return true;
}
+ @Override
public String toString()
{
StringBuilder builder = new StringBuilder();
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/IdAllocator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/IdAllocator.java?rev=433278&r1=433277&r2=433278&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/IdAllocator.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/util/IdAllocator.java Mon Aug 21 09:28:17 2006
@@ -54,6 +54,7 @@
}
/** Clones this instance, returning an equivalent but seperate copy. */
+ @Override
public NameGenerator clone()
{
try
@@ -89,6 +90,7 @@
/**
* Creates a clone of this IdAllocator instance, copying the allocator's namespace and key map.
*/
+ @Override
public IdAllocator clone()
{
// Copying the _generatorMap is tricky; multiple keys will point to the same NameGenerator
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/dom/DOMTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/dom/DOMTest.java?rev=433278&r1=433277&r2=433278&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/dom/DOMTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/dom/DOMTest.java Mon Aug 21 09:28:17 2006
@@ -22,7 +22,6 @@
import java.io.Reader;
import org.testng.Assert;
-import org.testng.annotations.ExpectedExceptions;
import org.testng.annotations.Test;
/**
@@ -115,8 +114,7 @@
assertEquals(d.toString(), "[empty Document]");
}
- @Test
- @ExpectedExceptions(IllegalArgumentException.class)
+ @Test(expectedExceptions = IllegalArgumentException.class)
public void attribute_names_may_not_be_blank()
{
Document d = new Document();
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ioc/ValidatingConfigurationWrapperTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ioc/ValidatingConfigurationWrapperTest.java?rev=433278&r1=433277&r2=433278&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ioc/ValidatingConfigurationWrapperTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ioc/ValidatingConfigurationWrapperTest.java Mon Aug 21 09:28:17 2006
@@ -25,6 +25,7 @@
*/
public class ValidatingConfigurationWrapperTest extends InternalBaseTestCase
{
+ @SuppressWarnings("unchecked")
@Test
public void valid_contribution()
{
@@ -45,6 +46,7 @@
verify();
}
+ @SuppressWarnings("unchecked")
@Test
public void null_contribution()
{
@@ -65,6 +67,7 @@
verify();
}
+ @SuppressWarnings("unchecked")
@Test
public void wrong_type_of_contribution()
{
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ioc/ValidatingOrderedConfigurationWrapperTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ioc/ValidatingOrderedConfigurationWrapperTest.java?rev=433278&r1=433277&r2=433278&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ioc/ValidatingOrderedConfigurationWrapperTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ioc/ValidatingOrderedConfigurationWrapperTest.java Mon Aug 21 09:28:17 2006
@@ -86,6 +86,7 @@
verify();
}
+ @SuppressWarnings("unchecked")
@Test
public void incorrect_contribution_type_is_passed_through_as_null()
{
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ioc/services/PipelineBuilderImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ioc/services/PipelineBuilderImplTest.java?rev=433278&r1=433277&r2=433278&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ioc/services/PipelineBuilderImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ioc/services/PipelineBuilderImplTest.java Mon Aug 21 09:28:17 2006
@@ -21,7 +21,7 @@
import org.apache.tapestry.internal.test.InternalBaseTestCase;
import org.apache.tapestry.ioc.Registry;
import org.apache.tapestry.ioc.services.PipelineBuilder;
-import org.testng.annotations.Configuration;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import static org.apache.tapestry.util.CollectionFactory.newList;
@@ -36,7 +36,7 @@
private PipelineBuilder _builder;
- @Configuration(beforeTestClass = true)
+ @BeforeClass
public void setup_builder()
{
Registry registry = buildRegistry();
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/parser/TemplateParserImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/parser/TemplateParserImplTest.java?rev=433278&r1=433277&r2=433278&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/parser/TemplateParserImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/parser/TemplateParserImplTest.java Mon Aug 21 09:28:17 2006
@@ -70,6 +70,7 @@
return new ClasspathResource(loader, path);
}
+ @SuppressWarnings("unchecked")
private <T extends TemplateToken> T get(List l, int index)
{
Object raw = l.get(index);
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/MarkupWriterImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/MarkupWriterImplTest.java?rev=433278&r1=433277&r2=433278&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/MarkupWriterImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/MarkupWriterImplTest.java Mon Aug 21 09:28:17 2006
@@ -17,7 +17,6 @@
import org.apache.tapestry.MarkupWriter;
import org.apache.tapestry.dom.Element;
import org.testng.Assert;
-import org.testng.annotations.ExpectedExceptions;
import org.testng.annotations.Test;
/**
@@ -25,8 +24,7 @@
*/
public class MarkupWriterImplTest extends Assert
{
- @Test
- @ExpectedExceptions(IllegalStateException.class)
+ @Test(expectedExceptions = IllegalStateException.class)
public void write_with_no_current_element()
{
MarkupWriter w = new MarkupWriterImpl();
@@ -34,8 +32,7 @@
w.write("fail!");
}
- @Test
- @ExpectedExceptions(IllegalStateException.class)
+ @Test(expectedExceptions = IllegalStateException.class)
public void comment_with_no_current_element()
{
MarkupWriter w = new MarkupWriterImpl();
@@ -43,8 +40,7 @@
w.comment("fail!");
}
- @Test
- @ExpectedExceptions(IllegalStateException.class)
+ @Test(expectedExceptions = IllegalStateException.class)
public void end_with_no_current_element()
{
MarkupWriter w = new MarkupWriterImpl();
@@ -52,8 +48,7 @@
w.end();
}
- @Test
- @ExpectedExceptions(IllegalStateException.class)
+ @Test(expectedExceptions = IllegalStateException.class)
public void attribute_with_no_current_element()
{
MarkupWriter w = new MarkupWriterImpl();
@@ -61,8 +56,7 @@
w.attribute("fail", "now");
}
- @Test
- @ExpectedExceptions(IllegalStateException.class)
+ @Test(expectedExceptions = IllegalStateException.class)
public void attributes_with_no_current_element()
{
MarkupWriter w = new MarkupWriterImpl();
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/ComponentInstantiatorSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/ComponentInstantiatorSourceImplTest.java?rev=433278&r1=433277&r2=433278&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/ComponentInstantiatorSourceImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/ComponentInstantiatorSourceImplTest.java Mon Aug 21 09:28:17 2006
@@ -42,7 +42,8 @@
import org.apache.tapestry.test.BaseTestCase;
import org.apache.tapestry.transform.TransformModule;
import org.testng.Assert;
-import org.testng.annotations.Configuration;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
/**
@@ -230,7 +231,7 @@
return target;
}
- @Configuration(beforeTestClass = true)
+ @BeforeClass
public void createRegistry() throws Exception
{
String tempdir = System.getProperty("java.io.tmpdir");
@@ -260,7 +261,7 @@
_source.addPackage("org.apache.tapestry.internal.transform.pages");
}
- @Configuration(afterTestClass = true)
+ @AfterClass
public void shutdownRegistry()
{
// _registry.shutdown();
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/pages/ClaimedFields.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/pages/ClaimedFields.java?rev=433278&r1=433277&r2=433278&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/pages/ClaimedFields.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/pages/ClaimedFields.java Mon Aug 21 09:28:17 2006
@@ -18,12 +18,12 @@
{
// Make sure results are sorted by putting this first
// but expecting them last.
-
+
private int _zzfield;
-
+
private int _field1;
- private static int field2;
+ private static int _field2;
public int _field3;
@@ -33,14 +33,14 @@
long _field6;
- public static final int getField2()
+ public static final int get_field2()
{
- return field2;
+ return _field2;
}
- public static final void setField2(int field2)
+ public static final void set_field2(int field2)
{
- field2 = field2;
+ _field2 = field2;
}
public final int getField1()