You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2006/09/19 20:17:52 UTC
svn commit: r447926 [3/3] - in /tapestry/tapestry5/tapestry-core/trunk:
.settings/ src/ src/main/java/org/apache/tapestry/
src/main/java/org/apache/tapestry/annotations/
src/main/java/org/apache/tapestry/dom/
src/main/java/org/apache/tapestry/internal/...
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ioc/services/LoggingDecoratorImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ioc/services/LoggingDecoratorImplTest.java?view=diff&rev=447926&r1=447925&r2=447926
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ioc/services/LoggingDecoratorImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ioc/services/LoggingDecoratorImplTest.java Tue Sep 19 11:17:45 2006
@@ -96,7 +96,7 @@
setThrowable(t);
train_isDebugEnabled(log, true);
-
+
log.debug("[ FAIL] run -- " + t.getClass().getName(), t);
replay();
@@ -131,7 +131,7 @@
setThrowable(t);
train_isDebugEnabled(log, true);
-
+
log.debug("[ FAIL] parse -- " + t.getClass().getName(), t);
replay();
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ioc/services/MiddleService.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ioc/services/MiddleService.java?view=diff&rev=447926&r1=447925&r2=447926
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ioc/services/MiddleService.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ioc/services/MiddleService.java Tue Sep 19 11:17:45 2006
@@ -14,8 +14,7 @@
package org.apache.tapestry.internal.ioc.services;
-
public interface MiddleService
{
- public void execute(int count, char ch, StringBuilder buffer);
+ public void execute(int count, char ch, StringBuilder buffer);
}
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?view=diff&rev=447926&r1=447925&r2=447926
==============================================================================
--- 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 Tue Sep 19 11:17:45 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.internal.ioc.services;
+import static org.apache.tapestry.util.CollectionFactory.newList;
+
import java.util.Arrays;
import java.util.List;
@@ -24,8 +26,6 @@
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-
-import static org.apache.tapestry.util.CollectionFactory.newList;
/**
* Integration tests for the PipelineBuilder service.
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ioc/services/RegistryShutdownHubImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ioc/services/RegistryShutdownHubImplTest.java?view=diff&rev=447926&r1=447925&r2=447926
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ioc/services/RegistryShutdownHubImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ioc/services/RegistryShutdownHubImplTest.java Tue Sep 19 11:17:45 2006
@@ -14,13 +14,13 @@
package org.apache.tapestry.internal.ioc.services;
+import static org.easymock.EasyMock.contains;
+import static org.easymock.EasyMock.same;
+
import org.apache.commons.logging.Log;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
import org.apache.tapestry.ioc.services.RegistryShutdownListener;
import org.testng.annotations.Test;
-
-import static org.easymock.EasyMock.contains;
-import static org.easymock.EasyMock.same;
/**
* @author Howard M. Lewis Ship
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ioc/services/ToStringService.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ioc/services/ToStringService.java?view=diff&rev=447926&r1=447925&r2=447926
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ioc/services/ToStringService.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ioc/services/ToStringService.java Tue Sep 19 11:17:45 2006
@@ -14,8 +14,7 @@
package org.apache.tapestry.internal.ioc.services;
-
public interface ToStringService
{
- public String toString();
+ public String toString();
}
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/AnnotatedPage.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/AnnotatedPage.java?view=diff&rev=447926&r1=447925&r2=447926
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/AnnotatedPage.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/AnnotatedPage.java Tue Sep 19 11:17:45 2006
@@ -15,8 +15,8 @@
package org.apache.tapestry.internal.services;
import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.annotations.SetupRender;
import org.apache.tapestry.annotations.ComponentClass;
+import org.apache.tapestry.annotations.SetupRender;
/**
* @author Howard M. Lewis Ship
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/BindingSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/BindingSourceImplTest.java?view=diff&rev=447926&r1=447925&r2=447926
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/BindingSourceImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/BindingSourceImplTest.java Tue Sep 19 11:17:45 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.internal.services;
+import static org.apache.tapestry.util.CollectionFactory.newMap;
+
import java.util.Map;
import org.apache.tapestry.Binding;
@@ -25,8 +27,6 @@
import org.apache.tapestry.services.BindingSource;
import org.testng.annotations.Test;
-import static org.apache.tapestry.util.CollectionFactory.newMap;
-
/**
* @author Howard M. Lewis Ship
*/
@@ -154,7 +154,8 @@
}
catch (TapestryException ex)
{
- assertTrue(ex.getMessage().contains("Could not convert 'full expression' into a component parameter binding"));
+ assertTrue(ex.getMessage().contains(
+ "Could not convert 'full expression' into a component parameter binding"));
assertTrue(ex.getMessage().contains(t.getMessage()));
assertSame(ex.getLocation(), l);
assertSame(ex.getCause(), t);
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ComponentLifecycleMethodWorkerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ComponentLifecycleMethodWorkerTest.java?view=diff&rev=447926&r1=447925&r2=447926
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ComponentLifecycleMethodWorkerTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ComponentLifecycleMethodWorkerTest.java Tue Sep 19 11:17:45 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.internal.services;
+import static org.apache.tapestry.util.CollectionFactory.newList;
+
import java.lang.reflect.Modifier;
import java.util.List;
@@ -26,8 +28,6 @@
import org.apache.tapestry.services.TransformConstants;
import org.apache.tapestry.test.BaseTestCase;
import org.testng.annotations.Test;
-
-import static org.apache.tapestry.util.CollectionFactory.newList;
/**
* @author Howard M. Lewis Ship
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImplTest.java?view=diff&rev=447926&r1=447925&r2=447926
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImplTest.java Tue Sep 19 11:17:45 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.internal.services;
+import static org.easymock.EasyMock.isA;
+
import java.io.File;
import java.net.URLClassLoader;
import java.util.Locale;
@@ -24,12 +26,8 @@
import org.apache.tapestry.events.UpdateEvent;
import org.apache.tapestry.internal.ClasspathResource;
import org.apache.tapestry.internal.parser.ComponentTemplate;
-import org.apache.tapestry.internal.services.ComponentTemplateSource;
-import org.apache.tapestry.internal.services.ComponentTemplateSourceImpl;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
import org.testng.annotations.Test;
-
-import static org.easymock.EasyMock.isA;
/**
* @author Howard M. Lewis Ship
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InfrastructureImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InfrastructureImplTest.java?view=diff&rev=447926&r1=447925&r2=447926
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InfrastructureImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InfrastructureImplTest.java Tue Sep 19 11:17:45 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.internal.services;
+import static org.apache.tapestry.util.CollectionFactory.newMap;
+
import java.util.Map;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
@@ -22,8 +24,6 @@
import org.apache.tapestry.services.Infrastructure;
import org.apache.tapestry.services.InfrastructureManager;
import org.testng.annotations.Test;
-
-import static org.apache.tapestry.util.CollectionFactory.newMap;
/**
* @author Howard M. Lewis Ship
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InfrastructureManagerImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InfrastructureManagerImplTest.java?view=diff&rev=447926&r1=447925&r2=447926
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InfrastructureManagerImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InfrastructureManagerImplTest.java Tue Sep 19 11:17:45 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.internal.services;
+import static org.apache.tapestry.util.CollectionFactory.newList;
+
import java.util.Collection;
import java.util.Map;
@@ -22,8 +24,6 @@
import org.apache.tapestry.services.InfrastructureContribution;
import org.apache.tapestry.services.InfrastructureManager;
import org.testng.annotations.Test;
-
-import static org.apache.tapestry.util.CollectionFactory.newList;
/**
* @author Howard M. Lewis Ship
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InternalClassTransformationImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InternalClassTransformationImplTest.java?view=diff&rev=447926&r1=447925&r2=447926
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InternalClassTransformationImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InternalClassTransformationImplTest.java Tue Sep 19 11:17:45 2006
@@ -14,6 +14,9 @@
package org.apache.tapestry.internal.services;
+import static java.lang.Thread.currentThread;
+import static java.util.Arrays.asList;
+
import java.lang.annotation.Documented;
import java.lang.annotation.Target;
import java.lang.reflect.Modifier;
@@ -50,9 +53,6 @@
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import static java.lang.Thread.currentThread;
-import static java.util.Arrays.asList;
-
/**
* <p>
* The tests share a number of resources, and so are run sequentially.
@@ -750,7 +750,7 @@
"_$myPackagePrivate",
"_$myProtected",
"_$myPublic")));
-
+
replay();
ClassTransformation ct = createClassTransformation(VisibilityBean.class, log);
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/PageLoaderImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/PageLoaderImplTest.java?view=diff&rev=447926&r1=447925&r2=447926
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/PageLoaderImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/PageLoaderImplTest.java Tue Sep 19 11:17:45 2006
@@ -14,6 +14,10 @@
package org.apache.tapestry.internal.services;
+import static org.apache.tapestry.util.CollectionFactory.newSet;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.isA;
+
import java.util.Arrays;
import java.util.Locale;
@@ -32,10 +36,6 @@
import org.apache.tapestry.model.EmbeddedComponentModel;
import org.apache.tapestry.services.BindingSource;
import org.testng.annotations.Test;
-
-import static org.apache.tapestry.util.CollectionFactory.newSet;
-import static org.easymock.EasyMock.eq;
-import static org.easymock.EasyMock.isA;
/**
* @author Howard M. Lewis Ship
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/RetainWorkerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/RetainWorkerTest.java?view=diff&rev=447926&r1=447925&r2=447926
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/RetainWorkerTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/RetainWorkerTest.java Tue Sep 19 11:17:45 2006
@@ -15,7 +15,6 @@
package org.apache.tapestry.internal.services;
import org.apache.tapestry.annotations.Retain;
-import org.apache.tapestry.internal.services.RetainWorker;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ClassTransformation;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/TemplateParserImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/TemplateParserImplTest.java?view=diff&rev=447926&r1=447925&r2=447926
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/TemplateParserImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/TemplateParserImplTest.java Tue Sep 19 11:17:45 2006
@@ -14,6 +14,9 @@
package org.apache.tapestry.internal.services;
+import static org.apache.tapestry.util.CollectionFactory.newSet;
+import static org.easymock.EasyMock.contains;
+
import java.util.Arrays;
import java.util.List;
import java.util.Set;
@@ -36,9 +39,6 @@
import org.apache.tapestry.internal.parser.TextToken;
import org.apache.tapestry.test.BaseTestCase;
import org.testng.annotations.Test;
-
-import static org.apache.tapestry.util.CollectionFactory.newSet;
-import static org.easymock.EasyMock.contains;
/**
* This is used to test the template parser ... and in some cases, the underlying behavior of the
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/UnclaimedFieldWorkerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/UnclaimedFieldWorkerTest.java?view=diff&rev=447926&r1=447925&r2=447926
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/UnclaimedFieldWorkerTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/UnclaimedFieldWorkerTest.java Tue Sep 19 11:17:45 2006
@@ -19,7 +19,6 @@
import java.lang.reflect.Modifier;
-import org.apache.tapestry.internal.services.UnclaimedFieldWorker;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ClassTransformation;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/VisibilityBean.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/VisibilityBean.java?view=diff&rev=447926&r1=447925&r2=447926
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/VisibilityBean.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/VisibilityBean.java Tue Sep 19 11:17:45 2006
@@ -24,7 +24,7 @@
public class VisibilityBean
{
// Got to some real effort to provoke some name collisions!
-
+
@Retain
public static int _$myStatic;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/pages/ChildClassInheritsAnnotation.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/pages/ChildClassInheritsAnnotation.java?view=diff&rev=447926&r1=447925&r2=447926
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/pages/ChildClassInheritsAnnotation.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/pages/ChildClassInheritsAnnotation.java Tue Sep 19 11:17:45 2006
@@ -17,7 +17,6 @@
/**
* Used to check that Javassist does make child classes inherit class annotations.
*
- *
* @author Howard M. Lewis Ship
*/
public class ChildClassInheritsAnnotation extends ParentClass
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/BarneyModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/BarneyModule.java?view=diff&rev=447926&r1=447925&r2=447926
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/BarneyModule.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/BarneyModule.java Tue Sep 19 11:17:45 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.ioc;
+import static org.apache.tapestry.util.CollectionFactory.newList;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -24,8 +26,6 @@
import org.apache.tapestry.ioc.annotations.Id;
import org.apache.tapestry.ioc.annotations.Match;
import org.apache.tapestry.ioc.annotations.Order;
-
-import static org.apache.tapestry.util.CollectionFactory.newList;
/**
* Module used to demonstrate decorator ordering.
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/FredModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/FredModule.java?view=diff&rev=447926&r1=447925&r2=447926
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/FredModule.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/FredModule.java Tue Sep 19 11:17:45 2006
@@ -14,18 +14,18 @@
package org.apache.tapestry.ioc;
+import static org.apache.tapestry.util.CollectionFactory.newList;
+
import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import org.apache.tapestry.ioc.annotations.Match;
-import org.apache.tapestry.ioc.annotations.Order;
import org.apache.tapestry.ioc.annotations.Contribute;
import org.apache.tapestry.ioc.annotations.Id;
import org.apache.tapestry.ioc.annotations.InjectService;
+import org.apache.tapestry.ioc.annotations.Match;
+import org.apache.tapestry.ioc.annotations.Order;
import org.apache.tapestry.ioc.annotations.Private;
-
-import static org.apache.tapestry.util.CollectionFactory.newList;
/**
* Module used to demonstrate decorator ordering.
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/IntegrationTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/IntegrationTest.java?view=diff&rev=447926&r1=447925&r2=447926
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/IntegrationTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/IntegrationTest.java Tue Sep 19 11:17:45 2006
@@ -314,7 +314,7 @@
Registry r = buildRegistry(EagerLoadModule.class);
assertTrue(EagerLoadModule._eagerLoadDidHappen);
-
+
r = null;
}
}
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/runtime/LifecycleEventTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/runtime/LifecycleEventTest.java?view=diff&rev=447926&r1=447925&r2=447926
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/runtime/LifecycleEventTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/runtime/LifecycleEventTest.java Tue Sep 19 11:17:45 2006
@@ -14,11 +14,11 @@
package org.apache.tapestry.runtime;
+import static org.easymock.EasyMock.contains;
+
import org.apache.commons.logging.Log;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
import org.testng.annotations.Test;
-
-import static org.easymock.EasyMock.contains;
/**
* @author Howard M. Lewis Ship
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/services/MethodSignatureTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/services/MethodSignatureTest.java?view=diff&rev=447926&r1=447925&r2=447926
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/services/MethodSignatureTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/services/MethodSignatureTest.java Tue Sep 19 11:17:45 2006
@@ -22,7 +22,6 @@
import java.util.Collections;
import java.util.List;
-import org.apache.tapestry.services.MethodSignature;
import org.apache.tapestry.util.CollectionFactory;
import org.testng.annotations.Test;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/services/SyncCostBench.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/services/SyncCostBench.java?view=diff&rev=447926&r1=447925&r2=447926
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/services/SyncCostBench.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/services/SyncCostBench.java Tue Sep 19 11:17:45 2006
@@ -14,13 +14,13 @@
package org.apache.tapestry.services;
+import static java.lang.String.format;
+import static java.lang.System.out;
+
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.apache.tapestry.internal.annotations.Concurrent;
-
-import static java.lang.String.format;
-import static java.lang.System.out;
/**
* Tests single-thread synchronization overhead using different techniques. Note that we're fudging
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/services/TransformUtilsTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/services/TransformUtilsTest.java?view=diff&rev=447926&r1=447925&r2=447926
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/services/TransformUtilsTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/services/TransformUtilsTest.java Tue Sep 19 11:17:45 2006
@@ -14,11 +14,11 @@
package org.apache.tapestry.services;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
import static org.apache.tapestry.services.TransformUtils.getDefaultValue;
import static org.apache.tapestry.services.TransformUtils.getWrapperType;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
/**
* @author Howard M. Lewis Ship
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/DefenseTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/DefenseTest.java?view=diff&rev=447926&r1=447925&r2=447926
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/DefenseTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/DefenseTest.java Tue Sep 19 11:17:45 2006
@@ -14,11 +14,11 @@
package org.apache.tapestry.util;
-import org.apache.tapestry.test.TestBase;
-import org.testng.annotations.Test;
-
import static org.apache.tapestry.util.Defense.notBlank;
import static org.apache.tapestry.util.Defense.notNull;
+
+import org.apache.tapestry.test.TestBase;
+import org.testng.annotations.Test;
/**
* @author Howard M. Lewis Ship
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/FindTheParameterizedType.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/FindTheParameterizedType.java?view=diff&rev=447926&r1=447925&r2=447926
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/FindTheParameterizedType.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/FindTheParameterizedType.java Tue Sep 19 11:17:45 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.util;
+import static java.lang.System.out;
+
import java.lang.reflect.Method;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
@@ -21,8 +23,6 @@
import java.util.Map;
import org.apache.tapestry.internal.util.Orderer;
-
-import static java.lang.System.out;
public class FindTheParameterizedType
{
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/IdAllocatorTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/IdAllocatorTest.java?view=diff&rev=447926&r1=447925&r2=447926
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/IdAllocatorTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/IdAllocatorTest.java Tue Sep 19 11:17:45 2006
@@ -14,9 +14,9 @@
package org.apache.tapestry.util;
-import org.testng.annotations.Test;
-
import static org.testng.Assert.assertEquals;
+
+import org.testng.annotations.Test;
/**
* Tests the {@link org.apache.tapestry.util.IdAllocator}class.