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 2007/11/12 23:23:28 UTC
svn commit: r594319 [35/40] - in /tapestry/tapestry5/trunk: ./
tapestry-annotations/
tapestry-annotations/src/main/java/org/apache/tapestry/beaneditor/
tapestry-annotations/src/site/ tapestry-component-report/
tapestry-component-report/src/main/java/or...
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/Coercion.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/Coercion.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/Coercion.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/Coercion.java Mon Nov 12 14:22:31 2007
@@ -1,36 +1,34 @@
-// 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.
-
+// 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.ioc.services;
/**
* Responsible for converting from one type to another. This is used primarily around component
* parameters.
- *
- *
+ *
* @param <S>
- * the source type (input)
+ * the source type (input)
* @param <T>
- * the target type (output)
+ * the target type (output)
*/
public interface Coercion<S, T>
{
/**
* Converts an input value.
- *
- * @param input
- * the input value
+ *
+ * @param input the input value
*/
T coerce(S input);
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/CoercionTuple.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/CoercionTuple.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/CoercionTuple.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/CoercionTuple.java Mon Nov 12 14:22:31 2007
@@ -21,11 +21,11 @@
* contribution type when buildign the TypeCoercer service. Wraps a {@link Coercion} object that
* performs the work with additional properties that describe the input and output types of the
* coercion, needed when searching for an appropriate coercion (or combination of coercions).
- *
+ *
* @param <S>
- * source (input) type
+ * source (input) type
* @param <T>
- * target (output) type
+ * target (output) type
*/
public final class CoercionTuple<S, T>
{
@@ -86,18 +86,14 @@
/**
* Internal-use constructor.
- *
- * @param sourceType
- * the source (or input) type of the coercion
- * @param targetType
- * the target (or output) type of the coercion
- * @param coercion
- * the object that performs the coercion
- * @param wrap
- * if true, the coercion is wrapped to provide a useful toString()
+ *
+ * @param sourceType the source (or input) type of the coercion
+ * @param targetType the target (or output) type of the coercion
+ * @param coercion the object that performs the coercion
+ * @param wrap if true, the coercion is wrapped to provide a useful toString()
*/
public CoercionTuple(Class<S> sourceType, Class<T> targetType, Coercion<S, T> coercion,
- boolean wrap)
+ boolean wrap)
{
notNull(sourceType, "sourceType");
notNull(targetType, "targetType");
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/DefaultImplementationBuilder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/DefaultImplementationBuilder.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/DefaultImplementationBuilder.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/DefaultImplementationBuilder.java Mon Nov 12 14:22:31 2007
@@ -1,23 +1,22 @@
-// 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.
-
+// 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.ioc.services;
/**
* Creates default implementatons of a class.
- *
- *
+ *
* @see org.apache.tapestry.ioc.services.ClassFab#addNoOpMethod(MethodSignature)
*/
public interface DefaultImplementationBuilder
@@ -26,7 +25,7 @@
* Creates a new implementation of the provided interface. Each method in the interface will be
* implemented as a noop method. The method will ignore any parameters and return null, or 0, or
* false (or return nothing if the method is void).
- *
+ *
* @param <S>
* @param serviceInterface
* @return
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/ExceptionAnalysis.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/ExceptionAnalysis.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/ExceptionAnalysis.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/ExceptionAnalysis.java Mon Nov 12 14:22:31 2007
@@ -1,27 +1,25 @@
-// 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.
-
+// 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.ioc.services;
-import java.util.List;
+import java.util.List;
/**
* An analysis of an exception (including nested exceptions).
- * <p>
+ * <p/>
* TODO: Make serializable and/or convert to XML format.
- *
- *
*/
public interface ExceptionAnalysis
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/ExceptionAnalyzer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/ExceptionAnalyzer.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/ExceptionAnalyzer.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/ExceptionAnalyzer.java Mon Nov 12 14:22:31 2007
@@ -1,24 +1,22 @@
-// 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.
-
+// 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.ioc.services;
/**
* Analyzes an exception, providing an analysis. The analysis easily exposes properties of the
* exception, the stack trace, and nested exceptions.
- *
- *
*/
public interface ExceptionAnalyzer
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/ExceptionInfo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/ExceptionInfo.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/ExceptionInfo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/ExceptionInfo.java Mon Nov 12 14:22:31 2007
@@ -1,39 +1,46 @@
-// 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.
-
+// 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.ioc.services;
-import java.util.List;
+import java.util.List;
/**
* Contains information about an analyzed exception.
- *
- *
+ *
* @see {@link ExceptionAnalysis}
*/
public interface ExceptionInfo
{
- /** The exception class name. */
+ /**
+ * The exception class name.
+ */
String getClassName();
- /** The message associated with the exception, possibly null. */
+ /**
+ * The message associated with the exception, possibly null.
+ */
String getMessage();
- /** Returns the names of the properties of the exception, sorted alphabetically. */
+ /**
+ * Returns the names of the properties of the exception, sorted alphabetically.
+ */
List<String> getPropertyNames();
- /** Returns a specific property of the exception by name. */
+ /**
+ * Returns a specific property of the exception by name.
+ */
Object getProperty(String name);
/**
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/ExceptionTracker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/ExceptionTracker.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/ExceptionTracker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/ExceptionTracker.java Mon Nov 12 14:22:31 2007
@@ -1,25 +1,23 @@
-// 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.
-
+// 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.ioc.services;
/**
* Used by {@link org.apache.tapestry.ioc.services.LoggingDecorator} to track which exceptions have
* been logged during the current request (the ExceptionTracker is perthread). This keeps redundant
* information from appearing in the console output.
- *
- *
*/
public interface ExceptionTracker
{
@@ -27,9 +25,8 @@
* Returns true if the indicated exception has already been logged (it is assumed that the
* exception will be logged if this method returns false). The exception is recorded for later
* checks.
- *
- * @param exception
- * to check
+ *
+ * @param exception to check
* @return false if the exception has not been previously checked, true otherwise
*/
boolean exceptionLogged(Throwable exception);
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/FactoryDefaults.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/FactoryDefaults.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/FactoryDefaults.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/FactoryDefaults.java Mon Nov 12 14:22:31 2007
@@ -14,12 +14,11 @@
package org.apache.tapestry.ioc.services;
+import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
@@ -27,7 +26,7 @@
* by contributing to FactoryDefaults are overridden by contributions to {@link ApplicationDefaults}.
*/
@Target(
-{ PARAMETER, FIELD })
+ {PARAMETER, FIELD})
@Retention(RUNTIME)
@Documented
public @interface FactoryDefaults
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/LoggingDecorator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/LoggingDecorator.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/LoggingDecorator.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/LoggingDecorator.java Mon Nov 12 14:22:31 2007
@@ -1,42 +1,36 @@
-// Copyright 2006, 2007 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.
-
+// Copyright 2006, 2007 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.ioc.services;
-
-import org.slf4j.Logger;
+
+import org.slf4j.Logger;
/**
* Service that can create a logging interceptor that wraps around a service implementation (or
* interceptor). The interceptor works with the service's log to log, at debug level, method entry
* (with arguments), method exit (with return value, if any) as well as any thrown exceptions.
- *
- *
*/
public interface LoggingDecorator
{
/**
* Builds a logging interceptor instance.
- *
+ *
* @param <T>
- * @param serviceInterface
- * interface implemented by the delegate
- * @param delegate
- * existing object to be wrapped
- * @param serviceId
- * id of service
- * @param logger
- * log used for debug level logging messages by the interceptor
+ * @param serviceInterface interface implemented by the delegate
+ * @param delegate existing object to be wrapped
+ * @param serviceId id of service
+ * @param logger log used for debug level logging messages by the interceptor
* @return a new object implementing the interface that can be used in place of the delegate,
* providing logging behavior around each method call on the service interface
*/
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/MethodIterator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/MethodIterator.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/MethodIterator.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/MethodIterator.java Mon Nov 12 14:22:31 2007
@@ -27,7 +27,7 @@
* MethodIterator understands some complications that can occur when a class inherits the same
* method from multiple interfaces and with slightly different signatures (due to the fact that
* declared thrown exceptions can vary slightly for the "same" method).
- *
+ *
* @see org.apache.tapestry.ioc.services.MethodSignature#isOverridingSignatureOf(MethodSignature)
*/
public class MethodIterator
@@ -75,9 +75,8 @@
* exhausted. Each method signature is returned exactly once (even if the same method signature
* is defined in multiple inherited classes or interfaces). The order in which method signatures
* are returned is not specified.
- *
- * @throws NoSuchElementException
- * if there are no more signatures
+ *
+ * @throws NoSuchElementException if there are no more signatures
*/
public MethodSignature next()
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/MethodSignature.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/MethodSignature.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/MethodSignature.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/MethodSignature.java Mon Nov 12 14:22:31 2007
@@ -25,12 +25,12 @@
* parameter types and exception types. Actual Method objects are tied to a particular class, and
* don't compare well with other otherwise identical Methods from other classes or interface;
* MethodSignatures are distinct from classes and compare well.
- * <p>
+ * <p/>
* Because the intended purpose is to compare methods from interfaces (which are always public and
* abstract) we don't bother to actually track the modifiers. In addition, at this time,
* MethodSignature <em>does not distinguish between instance and static
* methods</em>.
- * <p>
+ * <p/>
* This version of MethodSignature works with <em>loaded</em> classes, and it usually used in the
* context of {@link org.apache.tapestry.ioc.services.ClassFab} to create new classes and
* subclasses.
@@ -48,7 +48,7 @@
private Class[] _exceptionTypes;
public MethodSignature(Class returnType, String name, Class[] parameterTypes,
- Class[] exceptionTypes)
+ Class[] exceptionTypes)
{
_returnType = notNull(returnType, "returnType");
_name = notBlank(name, "name");
@@ -118,7 +118,7 @@
/**
* Returns true if the other object is an instance of MethodSignature with <em>identical</em>
* values for return type, name, parameter types and exception types.
- *
+ *
* @see #isOverridingSignatureOf(MethodSignature)
*/
@Override
@@ -192,7 +192,7 @@
* similar to {@link #toString()}, but omits the return type and information about thrown
* exceptions. A unique id is used by {@link MethodIterator} to identify overlapping methods
* (methods with the same name and parameter types but with different thrown exceptions).
- *
+ *
* @see #isOverridingSignatureOf(MethodSignature)
*/
public String getUniqueId()
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/PipelineBuilder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/PipelineBuilder.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/PipelineBuilder.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/PipelineBuilder.java Mon Nov 12 14:22:31 2007
@@ -1,22 +1,22 @@
-// Copyright 2006, 2007 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.
-
+// Copyright 2006, 2007 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.ioc.services;
-import java.util.List;
-
-import org.slf4j.Logger;
+import org.slf4j.Logger;
+
+import java.util.List;
/**
* Creates a pipeline from a service inteface and an ordered list of filters. Each filter is defined
@@ -24,47 +24,40 @@
* each method has an additional parameter that is an instance of the service interface. Typically,
* this service parameter (often named "delegate") is either the first or the last parameter of each
* method.
- * <p>
+ * <p/>
* The implementation of a filter method is expected to pass all of its parameters to the service
* instance passed into it.
- * <p>
+ * <p/>
* The interesting thing is that there may be multiple filters in the pipeline. A fabricated
* "bridge" object (that implements the service interface) is created to let each filter invoke
* methods on the next filter down the pipeline. This simplifies the model for creating pipelines,
* as each filter is coded as if it was directly "in front of" the terminator. In fact, it may be
* indirectly invoking methods on the next filter in the pipeline via a bridge instance.
- * <p>
+ * <p/>
* The builder is fairly smart about matching up service interface methods to filter interface
* methods, but keeping it simple is also a good idea.
- *
- *
*/
public interface PipelineBuilder
{
/**
* Creates a pipeline from the filters and a terminator.
- *
- * @param <S>
- * service type
- * @param <F>
- * filter type
- * @param log
- * logs any warnings generated when constructing the pipeline
+ *
+ * @param <S> service type
+ * @param <F> filter type
+ * @param log logs any warnings generated when constructing the pipeline
* @param serviceInterface
* @param filterInterface
- * @param filters
- * sorted list of filters
- * @param terminator
- * end of the pipeline
+ * @param filters sorted list of filters
+ * @param terminator end of the pipeline
* @return an object that encapsulates the filters and the terminator
*/
<S, F> S build(Logger log, Class<S> serviceInterface, Class<F> filterInterface, List<F> filters,
- S terminator);
+ S terminator);
/**
* Creates a pipeline from just the filters. A
* {@link DefaultImplementationBuilder default implementation} is created as the terminator.
- *
+ *
* @param <S>
* @param <F>
* @param log
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/PropertyAccess.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/PropertyAccess.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/PropertyAccess.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/PropertyAccess.java Mon Nov 12 14:22:31 2007
@@ -17,29 +17,25 @@
/**
* A wrapper around the JavaBean Introspector that allows more manageable access to JavaBean
* properties of objects.
- *
- * <p>
+ * <p/>
+ * <p/>
* Only provides access to <em>simple</em> properties. Indexed properties are ignored.
*/
public interface PropertyAccess
{
/**
* Reads the value of a property.
- *
- * @throws UnsupportedOperationException
- * if the property is write only
- * @throws IllegalArgumentException
- * if property does not exist
+ *
+ * @throws UnsupportedOperationException if the property is write only
+ * @throws IllegalArgumentException if property does not exist
*/
Object get(Object instance, String propertyName);
/**
* Updates the value of a property.
- *
- * @throws UnsupportedOperationException
- * if the property is read only
- * @throws IllegalArgumentException
- * if property does not exist
+ *
+ * @throws UnsupportedOperationException if the property is read only
+ * @throws IllegalArgumentException if property does not exist
*/
void set(Object instance, String propertyName, Object value);
@@ -54,6 +50,8 @@
*/
ClassPropertyAdapter getAdapter(Class forClass);
- /** Discards all stored property access information, discarding all created class adapters. */
+ /**
+ * Discards all stored property access information, discarding all created class adapters.
+ */
void clearCache();
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/PropertyAdapter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/PropertyAdapter.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/PropertyAdapter.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/PropertyAdapter.java Mon Nov 12 14:22:31 2007
@@ -19,7 +19,7 @@
/**
* Provides access to a single property within a class.
- *
+ *
* @see org.apache.tapestry.ioc.services.ClassPropertyAdapter
*/
public interface PropertyAdapter
@@ -51,24 +51,19 @@
/**
* Reads the property value.
- *
- * @param instance
- * to read from
- * @throws UnsupportedOperationException
- * if the property is write only
+ *
+ * @param instance to read from
+ * @throws UnsupportedOperationException if the property is write only
*/
Object get(Object instance);
/**
* Updates the property value. The provided value must not be null if the property type is
* primitive, and must otherwise be of the proper type.
- *
- * @param instance
- * to update
- * @param value
- * new value for the property
- * @throws UnsupportedOperationException
- * if the property is read only
+ *
+ * @param instance to update
+ * @param value new value for the property
+ * @throws UnsupportedOperationException if the property is read only
*/
void set(Object instance, Object value);
@@ -80,10 +75,9 @@
/**
* Returns an annotation on the property. The read method (if present) is checked first,
* followed by the write method.
- *
+ *
* @param <T>
- * @param annotationClass
- * the annotation to retrieve
+ * @param annotationClass the annotation to retrieve
* @return the annotation on the read or write method, or null if not present on either method
*/
<T extends Annotation> T getAnnotation(Class<T> annotationClass);
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/PropertyShadowBuilder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/PropertyShadowBuilder.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/PropertyShadowBuilder.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/PropertyShadowBuilder.java Mon Nov 12 14:22:31 2007
@@ -1,17 +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.
-
+// 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.ioc.services;
/**
@@ -19,24 +19,19 @@
* delegates all method invocations to the property. Each method invocation on the shadow
* re-acquires the value of the property from the underlying object and delegates to the current
* value of the property.
- * <p>
+ * <p/>
* Typically, the object in question is another service, one with the "perthread" service lifecycle.
* This allows a global singleton to shadow a value that is specific to the current thread (and
* therefore, the current request).
- *
- *
*/
public interface PropertyShadowBuilder
{
/**
* @param <T>
- * @param source
- * the object from which a property will be extracted
- * @param propertyName
- * the name of a property of the object, which must be readable
- * @param propertyType
- * the expected type of the property, the actual property type must be assignable to
- * this type
+ * @param source the object from which a property will be extracted
+ * @param propertyName the name of a property of the object, which must be readable
+ * @param propertyType the expected type of the property, the actual property type must be assignable to
+ * this type
* @return the shadow
*/
<T> T build(Object source, String propertyName, Class<T> propertyType);
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/RegistryShutdownHub.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/RegistryShutdownHub.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/RegistryShutdownHub.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/RegistryShutdownHub.java Mon Nov 12 14:22:31 2007
@@ -1,26 +1,26 @@
-// 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.
-
+// 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.ioc.services;
/**
* Event hub for notifications when the IOC {@link org.apache.tapestry.ioc.Registry} shuts down.
- *
- *
*/
public interface RegistryShutdownHub
{
- /** Adds a listener for eventual notification. */
+ /**
+ * Adds a listener for eventual notification.
+ */
void addRegistryShutdownListener(RegistryShutdownListener listener);
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/RegistryShutdownListener.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/RegistryShutdownListener.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/RegistryShutdownListener.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/RegistryShutdownListener.java Mon Nov 12 14:22:31 2007
@@ -1,25 +1,23 @@
-// 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.
-
+// 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.ioc.services;
-import java.util.EventListener;
+import java.util.EventListener;
/**
* Event listener interfaces for objects that need to know when the Registry shutsdown.
- *
- *
*/
public interface RegistryShutdownListener extends EventListener
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/ServiceActivity.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/ServiceActivity.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/ServiceActivity.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/ServiceActivity.java Mon Nov 12 14:22:31 2007
@@ -18,12 +18,14 @@
/**
* Provided by the {@link ServiceActivityScoreboard} to track a single service's state and activity.
- *
+ *
* @see ServiceDef
*/
public interface ServiceActivity
{
- /** The unique id for the service. */
+ /**
+ * The unique id for the service.
+ */
String getServiceId();
/**
@@ -32,9 +34,13 @@
*/
Class getServiceInterface();
- /** The scope of the service (typically "singleton" or "perthread"). */
+ /**
+ * The scope of the service (typically "singleton" or "perthread").
+ */
String getScope();
- /** Indicates the lifecycle status of the service. */
+ /**
+ * Indicates the lifecycle status of the service.
+ */
Status getStatus();
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/ServiceActivityScoreboard.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/ServiceActivityScoreboard.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/ServiceActivityScoreboard.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/ServiceActivityScoreboard.java Mon Nov 12 14:22:31 2007
@@ -22,6 +22,8 @@
*/
public interface ServiceActivityScoreboard
{
- /** Returns the status of all services, sorted alphabetically by service id. */
+ /**
+ * Returns the status of all services, sorted alphabetically by service id.
+ */
List<ServiceActivity> getServiceActivity();
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/ServiceLifecycleSource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/ServiceLifecycleSource.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/ServiceLifecycleSource.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/ServiceLifecycleSource.java Mon Nov 12 14:22:31 2007
@@ -1,32 +1,30 @@
-// 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.
-
+// 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.ioc.services;
-import org.apache.tapestry.ioc.ServiceLifecycle;
+import org.apache.tapestry.ioc.ServiceLifecycle;
/**
* Provides access to user defined lifecycles (beyond the two built-in lifecycles: "singleton" and
* "primitive"). The user defined lifecycles are contributed into the service's configuration.
- *
- *
*/
public interface ServiceLifecycleSource
{
/**
* Used to locate a configuration lifecycle, by name.
- *
+ *
* @param lifecycleName
* @return the named lifecycle, or null if the name is not found
*/
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/Status.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/Status.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/Status.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/Status.java Mon Nov 12 14:22:31 2007
@@ -22,15 +22,23 @@
*/
public enum Status
{
- /** A builtin service that exists before the {@link Registry} is constructed. */
+ /**
+ * A builtin service that exists before the {@link Registry} is constructed.
+ */
BUILTIN,
- /** The service is defined in a module, but has not yet been referenced. */
+ /**
+ * The service is defined in a module, but has not yet been referenced.
+ */
DEFINED,
- /** A proxy has been created for the service, but no methods of the proxy have been invoked. */
+ /**
+ * A proxy has been created for the service, but no methods of the proxy have been invoked.
+ */
VIRTUAL,
- /** A service implementation for the service has been created. */
+ /**
+ * A service implementation for the service has been created.
+ */
REAL;
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/StrategyBuilder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/StrategyBuilder.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/StrategyBuilder.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/StrategyBuilder.java Mon Nov 12 14:22:31 2007
@@ -1,33 +1,31 @@
-// 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.
-
+// 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.ioc.services;
-import org.apache.tapestry.ioc.util.StrategyRegistry;
+import org.apache.tapestry.ioc.util.StrategyRegistry;
/**
* A service implementation builder that operates around a {@link StrategyRegistry}, implementing a
* version of the Gang of Four Strategy pattern.
- * <p>
+ * <p/>
* The constructed service is configured with a number of adapters (that implement the same service
* interface). Method invocations on the service are routed to one of the adapters.
- * <p>
+ * <p/>
* The first parameter of each method is used to select the appropriate adapter.
- * <p>
+ * <p/>
* The ideal interface for use with this builder has only one method.
- *
- *
*/
public interface StrategyBuilder
{
@@ -35,11 +33,9 @@
* Given a number of adapters implementing the service interface, builds a "dispatcher"
* implementations that delegates to the one of the adapters. It is an error if any of the
* methods takes no parameters.
- *
- * @param <S>
- * the service interface type
- * @param registry
- * defines the adapters based on parameter type (of the first parameter)
+ *
+ * @param <S> the service interface type
+ * @param registry defines the adapters based on parameter type (of the first parameter)
* @return a service implementation
*/
<S> S build(StrategyRegistry<S> registry);
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/SymbolProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/SymbolProvider.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/SymbolProvider.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/SymbolProvider.java Mon Nov 12 14:22:31 2007
@@ -14,13 +14,15 @@
package org.apache.tapestry.ioc.services;
-/** A provider of values for symbols. */
+/**
+ * A provider of values for symbols.
+ */
public interface SymbolProvider
{
/**
* Returns the value for the symbol, or null if this provider can not provide a value. The value
* itself may contain symbols that will be recursively expanded.
- *
+ *
* @param symbolName
* @return the value or null
*/
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/SymbolSource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/SymbolSource.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/SymbolSource.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/SymbolSource.java Mon Nov 12 14:22:31 2007
@@ -27,19 +27,18 @@
/**
* Expands the value for a particular symbol. This may involve recursive expansion, if the
* immediate value for the symbol itself contains symbols.
- *
+ *
* @param symbolName
* @return the expanded string
- * @throws RuntimeException
- * if the symbol name can not be expanded (no {@link SymbolProvider} can provide its
- * value), or if an expansion is directly or indirectly recursive
+ * @throws RuntimeException if the symbol name can not be expanded (no {@link SymbolProvider} can provide its
+ * value), or if an expansion is directly or indirectly recursive
*/
String valueForSymbol(String symbolName);
/**
* Given an input string that <em>may</em> contain symbols, returns the string with any and
* all symbols fully expanded.
- *
+ *
* @param input
* @return expanded input
*/
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/TapestryIOCModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/TapestryIOCModule.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/TapestryIOCModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/TapestryIOCModule.java Mon Nov 12 14:22:31 2007
@@ -14,47 +14,18 @@
package org.apache.tapestry.ioc.services;
+import org.apache.tapestry.ioc.*;
import static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE;
+import org.apache.tapestry.ioc.annotations.Marker;
+import org.apache.tapestry.ioc.annotations.Value;
+import org.apache.tapestry.ioc.internal.services.*;
+import org.apache.tapestry.services.MasterObjectProvider;
import java.io.File;
import java.lang.reflect.Array;
import java.math.BigDecimal;
import java.math.BigInteger;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.tapestry.ioc.Configuration;
-import org.apache.tapestry.ioc.MappedConfiguration;
-import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.ioc.ObjectProvider;
-import org.apache.tapestry.ioc.OrderedConfiguration;
-import org.apache.tapestry.ioc.ServiceBinder;
-import org.apache.tapestry.ioc.ServiceLifecycle;
-import org.apache.tapestry.ioc.annotations.Marker;
-import org.apache.tapestry.ioc.annotations.Value;
-import org.apache.tapestry.ioc.internal.services.ChainBuilderImpl;
-import org.apache.tapestry.ioc.internal.services.DefaultImplementationBuilderImpl;
-import org.apache.tapestry.ioc.internal.services.ExceptionAnalyzerImpl;
-import org.apache.tapestry.ioc.internal.services.ExceptionTrackerImpl;
-import org.apache.tapestry.ioc.internal.services.LoggingDecoratorImpl;
-import org.apache.tapestry.ioc.internal.services.MapSymbolProvider;
-import org.apache.tapestry.ioc.internal.services.MasterObjectProviderImpl;
-import org.apache.tapestry.ioc.internal.services.PerThreadServiceLifecycle;
-import org.apache.tapestry.ioc.internal.services.PipelineBuilderImpl;
-import org.apache.tapestry.ioc.internal.services.PropertyAccessImpl;
-import org.apache.tapestry.ioc.internal.services.PropertyShadowBuilderImpl;
-import org.apache.tapestry.ioc.internal.services.RegistryStartup;
-import org.apache.tapestry.ioc.internal.services.StrategyBuilderImpl;
-import org.apache.tapestry.ioc.internal.services.SymbolObjectProvider;
-import org.apache.tapestry.ioc.internal.services.SymbolSourceImpl;
-import org.apache.tapestry.ioc.internal.services.SystemPropertiesSymbolProvider;
-import org.apache.tapestry.ioc.internal.services.ThreadLocaleImpl;
-import org.apache.tapestry.ioc.internal.services.TypeCoercerImpl;
-import org.apache.tapestry.ioc.internal.services.ValueObjectProvider;
-import org.apache.tapestry.services.MasterObjectProvider;
+import java.util.*;
/**
* Defines the base set of services for the Tapestry IOC container.
@@ -101,7 +72,9 @@
};
}
- /** Contributes the "perthread" scope. */
+ /**
+ * Contributes the "perthread" scope.
+ */
public void contributeServiceLifecycleSource(
MappedConfiguration<String, ServiceLifecycle> configuration, ObjectLocator locator)
{
@@ -111,7 +84,7 @@
/**
* Contributes "DefaultProvider", ordered last, that delegates to
* {@link ObjectLocator#getService(Class)}.
- * <p>
+ * <p/>
* Contributes "Value", which injects values (not services) triggered by the {@link Value}
* annotation.
*/
@@ -156,7 +129,7 @@
* <li>Null to BigInteger (zero)</li>
* <li>String to File</li>
* </ul>
- * <p>
+ * <p/>
* The coercion of String to Long, BigInteger, Double and BigDecimal causes some minor headaches
* when attempting to add coercions from null to various numeric types: we end up having to have
* many more coercions for the null case to prevent null --> String --> BigInteger. This may
@@ -416,7 +389,7 @@
}
private static <S, T> void add(Configuration<CoercionTuple> configuration, Class<S> sourceType,
- Class<T> targetType, Coercion<S, T> coercion)
+ Class<T> targetType, Coercion<S, T> coercion)
{
CoercionTuple<S, T> tuple = new CoercionTuple<S, T>(sourceType, targetType, coercion);
@@ -424,11 +397,11 @@
}
public static void contributeSymbolSource(OrderedConfiguration<SymbolProvider> configuration,
- @ApplicationDefaults
- SymbolProvider applicationDefaults,
+ @ApplicationDefaults
+ SymbolProvider applicationDefaults,
- @FactoryDefaults
- SymbolProvider factoryDefaults)
+ @FactoryDefaults
+ SymbolProvider factoryDefaults)
{
configuration.add("SystemProperties", new SystemPropertiesSymbolProvider());
configuration.add("ApplicationDefaults", applicationDefaults, "after:SystemProperties");
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/ThreadCleanupHub.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/ThreadCleanupHub.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/ThreadCleanupHub.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/ThreadCleanupHub.java Mon Nov 12 14:22:31 2007
@@ -25,9 +25,8 @@
* Adds a listener to the hub. The hub maintains a seperate list of listeners for each thread
* (i.e., using a ThreadLocal). Further, the listener list is discarded at the end of the
* request.
- *
- * @param listener
- * to add
+ *
+ * @param listener to add
*/
void addThreadCleanupListener(ThreadCleanupListener listener);
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/ThreadCleanupListener.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/ThreadCleanupListener.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/ThreadCleanupListener.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/ThreadCleanupListener.java Mon Nov 12 14:22:31 2007
@@ -1,28 +1,27 @@
-// 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.
-
+// 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.ioc.services;
-import java.util.EventListener;
+import java.util.EventListener;
/**
* Listener interface for object that need to know about thread event cleanup.
- * <p>
+ * <p/>
* Note that registration with the {@link org.apache.tapestry.ioc.services.ThreadCleanupHub} is a
* one-shot affair; it lasts no longer than the next cleanup.
- *
- *
+ *
* @see org.apache.tapestry.ioc.services.ThreadCleanupHub
*/
public interface ThreadCleanupListener extends EventListener
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/ThreadLocale.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/ThreadLocale.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/ThreadLocale.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/ThreadLocale.java Mon Nov 12 14:22:31 2007
@@ -14,10 +14,10 @@
package org.apache.tapestry.ioc.services;
-import java.util.Locale;
-
import org.apache.tapestry.ioc.Registry;
+import java.util.Locale;
+
/**
* Stores the locale <em>for the current thread</em>. This value persists until
* {@link Registry#cleanupThread()} is invoked.
@@ -26,16 +26,15 @@
{
/**
* Updates the locale for the current thread.
- *
- * @param locale
- * the new locale (may not be null)
+ *
+ * @param locale the new locale (may not be null)
*/
void setLocale(Locale locale);
/**
* Returns the thread's locale, which will be the JVM's default locale, until
* {@link #setLocale(Locale)} is invoked.
- *
+ *
* @return the thread's locale
*/
Locale getLocale();
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/TypeCoercer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/TypeCoercer.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/TypeCoercer.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/TypeCoercer.java Mon Nov 12 14:22:31 2007
@@ -26,14 +26,11 @@
* primitive, the actual conversion will be to the equivalent wrapper type. In some cases, the
* TypeCoercer will need to search for an appropriate coercion, and may even combine existing
* coercions to form new ones; in those cases, the results of the search are cached.
- *
- * @param <S>
- * source type (input)
- * @param <T>
- * target type (output)
+ *
+ * @param <S> source type (input)
+ * @param <T> target type (output)
* @param input
- * @param targetType
- * defines the target type
+ * @param targetType defines the target type
* @return the coerced value
*/
<S, T> T coerce(S input, Class<T> targetType);
@@ -42,20 +39,18 @@
* Used primarily inside test suites, this method performs the same steps as
* {@link #coerce(Object, Class)}, but returns a string describing the series of coercision,
* such as "Object --> String --> Long --> Integer".
- *
- * @param <S>
- * source type (input)
- * @param <T>
- * target type (output)
- * @param inputType
- * the source coercion type (use void.class for coercions from null)
- * @param targetType
- * defines the target type
+ *
+ * @param <S> source type (input)
+ * @param <T> target type (output)
+ * @param inputType the source coercion type (use void.class for coercions from null)
+ * @param targetType defines the target type
* @return a string identifying the series of coercions, or the empty string if no coercion is
* necessary
*/
<S, T> String explain(Class<S> inputType, Class<T> targetType);
- /** Clears cached information stored by the TypeCoercer. */
+ /**
+ * Clears cached information stored by the TypeCoercer.
+ */
void clearCache();
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/test/IOCTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/test/IOCTestCase.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/test/IOCTestCase.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/test/IOCTestCase.java Mon Nov 12 14:22:31 2007
@@ -14,30 +14,7 @@
package org.apache.tapestry.ioc.test;
-import static org.easymock.EasyMock.isA;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.util.Locale;
-
-import org.apache.tapestry.ioc.AnnotationProvider;
-import org.apache.tapestry.ioc.Configuration;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.LoggerSource;
-import org.apache.tapestry.ioc.MappedConfiguration;
-import org.apache.tapestry.ioc.MessageFormatter;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.ObjectCreator;
-import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.ioc.ObjectProvider;
-import org.apache.tapestry.ioc.OrderedConfiguration;
-import org.apache.tapestry.ioc.Registry;
-import org.apache.tapestry.ioc.RegistryBuilder;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.ioc.ServiceBuilderResources;
-import org.apache.tapestry.ioc.ServiceDecorator;
-import org.apache.tapestry.ioc.ServiceResources;
+import org.apache.tapestry.ioc.*;
import org.apache.tapestry.ioc.def.ContributionDef;
import org.apache.tapestry.ioc.def.DecoratorDef;
import org.apache.tapestry.ioc.def.ModuleDef;
@@ -46,9 +23,17 @@
import org.apache.tapestry.ioc.services.ThreadLocale;
import org.apache.tapestry.ioc.services.TypeCoercer;
import org.apache.tapestry.services.MasterObjectProvider;
+import static org.easymock.EasyMock.isA;
import org.slf4j.Logger;
-/** Add factory and trainer methods for the public interfaces of Tapestry IOC. */
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.util.Locale;
+
+/**
+ * Add factory and trainer methods for the public interfaces of Tapestry IOC.
+ */
public class IOCTestCase extends TestBase
{
protected final Registry buildRegistry(Class... moduleClasses)
@@ -83,7 +68,9 @@
return findMethod(this, methodName);
}
- /** Combines a series of lines by forming a string with a line separator after each line. */
+ /**
+ * Combines a series of lines by forming a string with a line separator after each line.
+ */
protected final String join(String... lines)
{
StringBuilder result = new StringBuilder();
@@ -170,7 +157,9 @@
return newMock(Resource.class);
}
- /** Frequently used as a placeholder for an arbitrary service (but its nice and simple). */
+ /**
+ * Frequently used as a placeholder for an arbitrary service (but its nice and simple).
+ */
protected final Runnable mockRunnable()
{
return newMock(Runnable.class);
@@ -222,7 +211,7 @@
}
protected <S, T> void train_coerce(TypeCoercer coercer, S input, Class<T> expectedType,
- T coercedValue)
+ T coercedValue)
{
expect(coercer.coerce(input, expectedType)).andReturn(coercedValue);
}
@@ -233,7 +222,7 @@
}
protected final void train_createInterceptor(ServiceDecorator decorator, Object coreObject,
- Object interceptor)
+ Object interceptor)
{
expect(decorator.createInterceptor(coreObject)).andReturn(interceptor);
}
@@ -264,7 +253,9 @@
expect(base.forLocale(locale)).andReturn(resource);
}
- /** Have to put the result before the varargs. */
+ /**
+ * Have to put the result before the varargs.
+ */
protected void train_format(MessageFormatter formatter, String result, Object... arguments)
{
expect(formatter.format(arguments)).andReturn(result);
@@ -286,7 +277,7 @@
}
protected final void train_getMessageFormatter(Messages messages, String key,
- MessageFormatter formatter)
+ MessageFormatter formatter)
{
expect(messages.getFormatter(key)).andReturn(formatter).atLeastOnce();
}
@@ -297,13 +288,13 @@
}
protected final <T> void train_getService(ObjectLocator locator, Class<T> serviceInterface,
- T service)
+ T service)
{
expect(locator.getService(serviceInterface)).andReturn(service);
}
protected final <T> void train_getService(ObjectLocator locator, String serviceId,
- Class<T> serviceInterface, T service)
+ Class<T> serviceInterface, T service)
{
expect(locator.getService(serviceId, serviceInterface)).andReturn(service);
}
@@ -325,7 +316,7 @@
}
protected final void train_getServiceInterface(ServiceResources resources,
- Class serviceInterface)
+ Class serviceInterface)
{
expect(resources.getServiceInterface()).andReturn(serviceInterface).atLeastOnce();
}
@@ -347,13 +338,13 @@
}
protected final void train_matches(DecoratorDef decoratorDef, ServiceDef serviceDef,
- boolean matches)
+ boolean matches)
{
expect(decoratorDef.matches(serviceDef)).andReturn(matches);
}
protected final <T> void train_provide(ObjectProvider provider, Class<T> objectType,
- AnnotationProvider annotationProvider, ObjectLocator locator, T object)
+ AnnotationProvider annotationProvider, ObjectLocator locator, T object)
{
expect(provider.provide(objectType, annotationProvider, locator)).andReturn(object);
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/test/MockTester.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/test/MockTester.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/test/MockTester.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/test/MockTester.java Mon Nov 12 14:22:31 2007
@@ -53,11 +53,9 @@
/**
* Creates a new mock object of the indicated type. The shared mock control does <strong>not</strong>
* check order, but does fail on any unexpected method invocations.
- *
- * @param <T>
- * the type of the mock object
- * @param mockClass
- * the class to mock
+ *
+ * @param <T> the type of the mock object
+ * @param mockClass the class to mock
* @return the mock object, ready for training
*/
public <T> T newMock(Class<T> mockClass)
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/test/TestBase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/test/TestBase.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/test/TestBase.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/test/TestBase.java Mon Nov 12 14:22:31 2007
@@ -14,34 +14,34 @@
package org.apache.tapestry.ioc.test;
-import java.util.Arrays;
-import java.util.List;
-
import org.easymock.EasyMock;
import org.easymock.IExpectationSetters;
import org.easymock.IMocksControl;
import org.testng.Assert;
import org.testng.annotations.AfterMethod;
+import java.util.Arrays;
+import java.util.List;
+
/**
* Manages a set of EasyMock mock objects. Used as a base class for test cases.
- * <p>
+ * <p/>
* Extends from {@link org.testng.Assert} to bring in all the public static assert methods without
* requiring extra imports.
- * <p>
+ * <p/>
* Provides a common mock factory method, {@link #newMock(Class)}. A single <em>standard</em>
* mock control is used for all mock objects. Standard mocks do not care about the exact order in
* which methods are invoked, though they are as rigourous as strict mocks when checking that
* parameters are the correct values.
- * <p>
+ * <p/>
* This base class is created with the intention of use within a TestNG test suite; if using JUnit,
* you can get the same functionality using {@link MockTester}.
- * <p>
+ * <p/>
* This class is thread safe (it uses a thread local to store the mock control). In theory, this
* should allow TestNG to execute tests in parallel. Unfortunately, as of this writing (TestNG 5.1
* and maven-surefire 2.8-SNAPSHOT) parallel execution does not always work fully and consistently,
* some tests are dropped, and so Tapestry does not make use of TestNG parallel execution.
- *
+ *
* @see EasyMock#createControl()
* @see MockTester
*/
@@ -78,11 +78,9 @@
/**
* Creates a new mock object of the indicated type. The shared mock control does <strong>not</strong>
* check order, but does fail on any unexpected method invocations.
- *
- * @param <T>
- * the type of the mock object
- * @param mockClass
- * the class to mock
+ *
+ * @param <T> the type of the mock object
+ * @param mockClass the class to mock
* @return the mock object, ready for training
*/
protected final <T> T newMock(Class<T> mockClass)
@@ -111,9 +109,8 @@
/**
* Convienience for {@link EasyMock#expectLastCall()} with
* {@link IExpectationSetters#andThrow(Throwable)}.
- *
- * @param throwable
- * the exception to be thrown by the most recent method call on any mock
+ *
+ * @param throwable the exception to be thrown by the most recent method call on any mock
*/
protected final void setThrowable(Throwable throwable)
{
@@ -132,7 +129,7 @@
/**
* Convienience for {@link EasyMock#expect(Object)}.
- *
+ *
* @param <T>
* @param value
* @return expectation setter, for setting return value, etc.
@@ -145,11 +142,9 @@
/**
* Asserts that the message property of the throwable contains each of the provided substrings.
- *
- * @param t
- * throwable to check
- * @param substrings
- * some number of expected substrings
+ *
+ * @param t throwable to check
+ * @param substrings some number of expected substrings
*/
protected final void assertMessageContains(Throwable t, String... substrings)
{
@@ -163,13 +158,10 @@
* Compares two lists for equality; first all the elements are individually compared for
* equality (if the lists are of unequal length, only elements up to the shorter length are
* compared). Then the length of the lists are compared. This generally gives
- *
- * @param <T>
- * type of objects to compare
- * @param actual
- * actual values to check
- * @param expected
- * expected values
+ *
+ * @param <T> type of objects to compare
+ * @param actual actual values to check
+ * @param expected expected values
*/
protected final <T> void assertListsEquals(List<T> actual, List<T> expected)
{
@@ -185,13 +177,10 @@
/**
* Convenience for {@link #assertListsEquals(List, List)}.
- *
- * @param <T>
- * tyoe of objects to compare
- * @param actual
- * actual values to check
- * @param expected
- * expected values
+ *
+ * @param <T> tyoe of objects to compare
+ * @param actual actual values to check
+ * @param expected expected values
*/
protected final <T> void assertListsEquals(List<T> actual, T... expected)
{
@@ -200,13 +189,10 @@
/**
* Convenience for {@link #assertListsEquals(List, List)}.
- *
- * @param <T>
- * tyoe of objects to compare
- * @param actual
- * actual values to check
- * @param expected
- * expected values
+ *
+ * @param <T> tyoe of objects to compare
+ * @param actual actual values to check
+ * @param expected expected values
*/
protected final <T> void assertArraysEqual(T[] actual, T... expected)
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/AbstractMessages.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/AbstractMessages.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/AbstractMessages.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/AbstractMessages.java Mon Nov 12 14:22:31 2007
@@ -14,16 +14,15 @@
package org.apache.tapestry.ioc.util;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newCaseInsensitiveMap;
-
-import java.util.Map;
-
import org.apache.tapestry.ioc.MessageFormatter;
import org.apache.tapestry.ioc.Messages;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newCaseInsensitiveMap;
import org.apache.tapestry.ioc.internal.util.ConcurrentBarrier;
import org.apache.tapestry.ioc.internal.util.Invokable;
import org.apache.tapestry.ioc.internal.util.MessageFormatterImpl;
+import java.util.Map;
+
/**
* Abstract implementation of {@link Messages} that doesn't know where values come from (that
* information is supplied in a subclass, via the {@link #valueForKey(String)} method).
@@ -32,15 +31,16 @@
{
private final ConcurrentBarrier _barrier = new ConcurrentBarrier();
- /** String key to MF instance. */
+ /**
+ * String key to MF instance.
+ */
private final Map<String, MessageFormatter> _cache = newCaseInsensitiveMap();
/**
* Invoked to provide the value for a particular key. This may be invoked multiple times even
* for the same key. The implementation should <em>ignore the case of the key</em>.
- *
- * @param key
- * the key to obtain a value for (case insensitive)
+ *
+ * @param key the key to obtain a value for (case insensitive)
* @return the value for the key, or null if this instance can not provide the value
*/
protected abstract String valueForKey(String key);
@@ -76,7 +76,9 @@
public void run()
{
_cache.put(key, newFormatter);
- };
+ }
+
+ ;
});
return newFormatter;
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/BodyBuilder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/BodyBuilder.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/BodyBuilder.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/BodyBuilder.java Mon Nov 12 14:22:31 2007
@@ -14,17 +14,17 @@
package org.apache.tapestry.ioc.util;
-import java.util.Formatter;
-
import org.apache.tapestry.ioc.services.MethodSignature;
+import java.util.Formatter;
+
/**
* Utility class for assembling the <em>body</em> used with Javassist when defining a method or
* constructor. Basically, assists with formatting and with indentation. This makes the code that
* assembles a method body much simpler ... and it makes the result neater, which will be easier to
* debug (debugging dynamically generated code is hard enough that it should be easy to read the
* input code before worrying about why it doesn't compile or execute properly).
- * <p>
+ * <p/>
* This class is not threadsafe.
*/
public final class BodyBuilder
@@ -58,11 +58,9 @@
/**
* Adds text to the current line, without ending the line.
- *
- * @param a
- * string format, as per {@link java.util.Formatter}
- * @param args
- * arguments referenced by format specifiers
+ *
+ * @param a string format, as per {@link java.util.Formatter}
+ * @param args arguments referenced by format specifiers
*/
public void add(String format, Object... args)
{
@@ -71,11 +69,9 @@
/**
* Adds text to the current line and ends the line.
- *
- * @param a
- * string format, as per {@link java.util.Formatter}
- * @param args
- * arguments referenced by format specifiers
+ *
+ * @param a string format, as per {@link java.util.Formatter}
+ * @param args arguments referenced by format specifiers
*/
public void addln(String format, Object... args)
{
@@ -145,7 +141,7 @@
* Returns the current contents of the buffer. This value is often passed to methods such as
* {@link org.apache.tapestry.ioc.services.ClassFab#addConstructor(Class[], Class[], String)} or
* {@link org.apache.tapestry.ioc.services.ClassFab#addMethod(int, MethodSignature, String)}.
- * <p>
+ * <p/>
* A BodyBuilder can be used again after invoking toString(), typically by invoking
* {@link #clear()}.
*/
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/CaseInsensitiveMap.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/CaseInsensitiveMap.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/CaseInsensitiveMap.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/CaseInsensitiveMap.java Mon Nov 12 14:22:31 2007
@@ -15,13 +15,7 @@
package org.apache.tapestry.ioc.util;
import java.io.Serializable;
-import java.util.AbstractMap;
-import java.util.AbstractSet;
-import java.util.ConcurrentModificationException;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Set;
+import java.util.*;
/**
* An mapped collection where the keys are always strings and access to values is case-insensitive.
@@ -31,9 +25,9 @@
* thousands or millions of key/value pairs. Unlike HashMap, it is based on a sorted list of entries
* rather than hash bucket. It is also geared towards a largely static map, one that is created and
* then used without modification.
- *
+ *
* @param <V>
- * the type of value stored
+ * the type of value stored
*/
public class CaseInsensitiveMap<V> extends AbstractMap<String, V> implements Serializable
{
@@ -82,9 +76,8 @@
/**
* Returns true if both keys are null, or if the provided key is the same as, or
* case-insensitively equal to, the entrie's key.
- *
- * @param key
- * to compare against
+ *
+ * @param key to compare against
* @return true if equal
*/
boolean matches(String key)
@@ -442,7 +435,7 @@
* select() has located a matching hashCode, but there's an outlying possibility that multiple
* keys share the same hashCode. Backup the cursor until we get to locate the initial hashCode
* match, then march forward until the key is located, or the hashCode stops matching.
- *
+ *
* @param key
* @param hashCode
*/