Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ioc/InterceptorStackBuilderTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ioc/InterceptorStackBuilderTest.java?view=diff&rev=468481&r1=468480&r2=468481 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ioc/InterceptorStackBuilderTest.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ioc/InterceptorStackBuilderTest.java Fri Oct 27 11:00:05 2006 @@ -19,16 +19,11 @@ import java.util.List; -import org.apache.tapestry.internal.annotations.SuppressNullCheck; import org.apache.tapestry.internal.test.InternalBaseTestCase; import org.apache.tapestry.ioc.ObjectCreator; import org.apache.tapestry.ioc.ServiceDecorator; import org.testng.annotations.Test; -/** - * - */ [EMAIL PROTECTED] public class InterceptorStackBuilderTest extends InternalBaseTestCase { private static final String SERVICE_ID = "foo.bar.Baz";
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ioc/services/TypeCoercerImplTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ioc/services/TypeCoercerImplTest.java?view=diff&rev=468481&r1=468480&r2=468481 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ioc/services/TypeCoercerImplTest.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ioc/services/TypeCoercerImplTest.java Fri Oct 27 11:00:05 2006 @@ -20,7 +20,6 @@ import java.util.List; import java.util.Map; -import org.apache.tapestry.internal.annotations.SuppressNullCheck; import org.apache.tapestry.internal.test.InternalBaseTestCase; import org.apache.tapestry.ioc.services.TypeCoercer; import org.testng.annotations.AfterClass; @@ -28,10 +27,6 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -/** - * - */ [EMAIL PROTECTED] public class TypeCoercerImplTest extends InternalBaseTestCase { private TypeCoercer _coercer; Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/FieldAccessBean.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/FieldAccessBean.java?view=diff&rev=468481&r1=468480&r2=468481 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/FieldAccessBean.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/FieldAccessBean.java Fri Oct 27 11:00:05 2006 @@ -14,12 +14,6 @@ package org.apache.tapestry.internal.services; -import org.apache.tapestry.internal.annotations.SuppressNullCheck; - -/** - * - */ [EMAIL PROTECTED] public class FieldAccessBean { private String _foo; Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/MixinWorkerTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/MixinWorkerTest.java?view=diff&rev=468481&r1=468480&r2=468481 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/MixinWorkerTest.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/MixinWorkerTest.java Fri Oct 27 11:00:05 2006 @@ -1,3 +1,17 @@ +// Copyright 2006 The Apache Software Foundation +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + package org.apache.tapestry.internal.services; import org.apache.tapestry.annotations.Mixin; Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ParameterComponent.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ParameterComponent.java?view=diff&rev=468481&r1=468480&r2=468481 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ParameterComponent.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ParameterComponent.java Fri Oct 27 11:00:05 2006 @@ -16,15 +16,11 @@ import org.apache.tapestry.annotations.ComponentClass; import org.apache.tapestry.annotations.Parameter; -import org.apache.tapestry.internal.annotations.SuppressNullCheck; /** * Used by [EMAIL PROTECTED] org.apache.tapestry.internal.services.ParameterWorkerTest}. - * - * */ @ComponentClass [EMAIL PROTECTED] public class ParameterComponent { @Parameter Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ReadOnlyBean.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ReadOnlyBean.java?view=diff&rev=468481&r1=468480&r2=468481 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ReadOnlyBean.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ReadOnlyBean.java Fri Oct 27 11:00:05 2006 @@ -14,12 +14,6 @@ package org.apache.tapestry.internal.services; -import org.apache.tapestry.internal.annotations.SuppressNullCheck; - -/** - * - */ [EMAIL PROTECTED] public class ReadOnlyBean { private String _value; 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=468481&r1=468480&r2=468481 ============================================================================== --- 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 Fri Oct 27 11:00:05 2006 @@ -274,7 +274,9 @@ // start(html), text, body, text, end(html) assertEquals(tokens.size(), 5); - assertTrue(get(tokens, 2) instanceof BodyToken); + // javac bug is requires use of isInstance() instead of instanceof + // https://bugs.eclipse.org/bugs/show_bug.cgi?id=113218 + assertTrue(BodyToken.class.isInstance(get(tokens, 2))); } @Test @@ -306,9 +308,12 @@ assertEquals(tokens.size(), 5); - assertTrue(get(tokens, 2) instanceof BodyToken); - assertTrue(get(tokens, 3) instanceof TextToken); - assertTrue(get(tokens, 4) instanceof EndElementToken); + // javac bug is requires use of isInstance() instead of instanceof + // https://bugs.eclipse.org/bugs/show_bug.cgi?id=113218 + + assertTrue(BodyToken.class.isInstance(get(tokens, 2))); + assertTrue(TextToken.class.isInstance(get(tokens, 3))); + assertTrue(EndElementToken.class.isInstance(get(tokens, 4))); verify(); } 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=468481&r1=468480&r2=468481 ============================================================================== --- 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 Fri Oct 27 11:00:05 2006 @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; -import org.apache.tapestry.internal.annotations.SuppressNullCheck; import org.apache.tapestry.ioc.annotations.Contribute; import org.apache.tapestry.ioc.annotations.Id; import org.apache.tapestry.ioc.annotations.Match; @@ -29,10 +28,8 @@ /** * Module used to demonstrate decorator ordering. - * - * */ [EMAIL PROTECTED] + @Id("barney") public class BarneyModule { 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=468481&r1=468480&r2=468481 ============================================================================== --- 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 Fri Oct 27 11:00:05 2006 @@ -20,7 +20,7 @@ import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.apache.tapestry.internal.annotations.Concurrent; +import org.apache.tapestry.internal.util.ConcurrentBarrier; /** * Tests single-thread synchronization overhead using different techniques. Note that we're fudging @@ -35,6 +35,8 @@ * ... for example, ReadWriteLockRunner is consistently slower than ReadWriteLockAspectRunner (one * would expect it to be the other way around ... must be something about how AspectJ weaves the * code ... and it's use of static methods in many cases). + * <p> + * Well, the Concurrent aspect is gone, replaced with the [EMAIL PROTECTED] ConcurrentBarrier} utility. */ public class SyncCostBench { @@ -85,9 +87,10 @@ } } - @Concurrent static class ReadWriteLockAspectRunner implements Runnable { + private final ConcurrentBarrier _barrier = new ConcurrentBarrier(); + private final Runnable _delegate; public ReadWriteLockAspectRunner(Runnable delegate) @@ -95,10 +98,9 @@ _delegate = delegate; } - @Concurrent.Read public void run() { - _delegate.run(); + _barrier.withRead(_delegate); } }
