You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by jo...@apache.org on 2011/06/28 08:51:27 UTC
svn commit: r1140454 - in /tapestry/tapestry5/trunk:
plastic/src/main/java/org/apache/tapestry5/internal/plastic/
plastic/src/main/java/org/apache/tapestry5/plastic/
tapestry-core/src/main/java/org/apache/tapestry5/corelib/internal/
tapestry-core/src/m...
Author: joshcanfield
Date: Tue Jun 28 06:51:27 2011
New Revision: 1140454
URL: http://svn.apache.org/viewvc?rev=1140454&view=rev
Log:
TAP5-1559 - Excessive warnings
Modified:
tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/NameCache.java
tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticInternalUtils.java
tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/plastic/PlasticUtils.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/internal/InternalMessages.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/BeanModelImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentClassCacheImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/XMLTokenType.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ParameterConduit.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/BaseURLSource.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/BeanBlockContribution.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/BeanBlockSource.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ClassTransformation.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/TapestryIOCModule.java
Modified: tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/NameCache.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/NameCache.java?rev=1140454&r1=1140453&r2=1140454&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/NameCache.java (original)
+++ tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/NameCache.java Tue Jun 28 06:51:27 2011
@@ -40,7 +40,7 @@ public class NameCache
protected String convert(Class input)
{
return toInternalName(input.getName());
- };
+ }
};
private final Cache<MethodDescription, String> md2desc = new Cache<MethodDescription, String>()
@@ -67,7 +67,7 @@ public class NameCache
protected String convert(Class type)
{
return PlasticUtils.toTypeName(type);
- };
+ }
};
public String toInternalName(String className)
Modified: tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticInternalUtils.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticInternalUtils.java?rev=1140454&r1=1140453&r2=1140454&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticInternalUtils.java (original)
+++ tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticInternalUtils.java Tue Jun 28 06:51:27 2011
@@ -237,8 +237,8 @@ public class PlasticInternalUtils
* Strips out leading and trailing underscores, leaving the real property name.
* In addition, "m_foo" is converted to "foo".
*
- * @param fieldName
- * @return
+ * @param fieldName to convert
+ * @return the property name
*/
public static String toPropertyName(String fieldName)
{
Modified: tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/plastic/PlasticUtils.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/plastic/PlasticUtils.java?rev=1140454&r1=1140453&r2=1140454&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/plastic/PlasticUtils.java (original)
+++ tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/plastic/PlasticUtils.java Tue Jun 28 06:51:27 2011
@@ -14,11 +14,11 @@
package org.apache.tapestry5.plastic;
+import org.apache.tapestry5.internal.plastic.PrimitiveType;
+
import java.lang.reflect.Method;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.tapestry5.internal.plastic.PrimitiveType;
-
/**
* Utilities for user code making use of Plastic.
*/
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/internal/InternalMessages.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/internal/InternalMessages.java?rev=1140454&r1=1140453&r2=1140454&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/internal/InternalMessages.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/internal/InternalMessages.java Tue Jun 28 06:51:27 2011
@@ -16,7 +16,7 @@ package org.apache.tapestry5.corelib.int
import org.apache.tapestry5.ioc.Messages;
import org.apache.tapestry5.ioc.internal.util.MessagesImpl;
-import org.apache.tapestry5.ioc.services.ClassFabUtils;
+import org.apache.tapestry5.plastic.PlasticUtils;
public final class InternalMessages
{
@@ -34,8 +34,8 @@ public final class InternalMessages
public static String failureInstantiatingObject(Class objectType, String componentId, Throwable cause)
{
- return MESSAGES.format("failure-instantitating-object", ClassFabUtils
- .toJavaClassName(objectType), componentId, cause);
+ return MESSAGES.format("failure-instantitating-object",
+ PlasticUtils.toTypeName(objectType), componentId, cause);
}
public static String conflictingEncodingType(String existing, String conflicting)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/BeanModelImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/BeanModelImpl.java?rev=1140454&r1=1140453&r2=1140454&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/BeanModelImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/BeanModelImpl.java Tue Jun 28 06:51:27 2011
@@ -1,4 +1,4 @@
-// Copyright 2007, 2008, 2010 The Apache Software Foundation
+// Copyright 2007, 2008, 2010, 2011 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.
@@ -14,9 +14,6 @@
package org.apache.tapestry5.internal.beaneditor;
-import java.util.List;
-import java.util.Map;
-
import org.apache.tapestry5.PropertyConduit;
import org.apache.tapestry5.beaneditor.BeanModel;
import org.apache.tapestry5.beaneditor.PropertyModel;
@@ -26,12 +23,15 @@ import org.apache.tapestry5.ioc.Messages
import org.apache.tapestry5.ioc.ObjectLocator;
import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
import org.apache.tapestry5.ioc.internal.util.InternalUtils;
-import org.apache.tapestry5.ioc.services.ClassFabUtils;
import org.apache.tapestry5.ioc.services.TypeCoercer;
import org.apache.tapestry5.ioc.util.AvailableValues;
import org.apache.tapestry5.ioc.util.UnknownValueException;
+import org.apache.tapestry5.plastic.PlasticUtils;
import org.apache.tapestry5.services.PropertyConduitSource;
+import java.util.List;
+import java.util.Map;
+
public class BeanModelImpl<T> implements BeanModel<T>
{
private final Class<T> beanType;
@@ -256,7 +256,7 @@ public class BeanModelImpl<T> implements
public String toString()
{
StringBuilder builder = new StringBuilder("BeanModel[");
- builder.append(ClassFabUtils.toJavaClassName(beanType));
+ builder.append(PlasticUtils.toTypeName(beanType));
builder.append(" properties:");
String sep = "";
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentClassCacheImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentClassCacheImpl.java?rev=1140454&r1=1140453&r2=1140454&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentClassCacheImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentClassCacheImpl.java Tue Jun 28 06:51:27 2011
@@ -1,4 +1,4 @@
-// Copyright 2008, 2010 The Apache Software Foundation
+// Copyright 2008, 2010, 2011 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.
@@ -14,9 +14,9 @@
package org.apache.tapestry5.internal.services;
+import org.apache.tapestry5.internal.plastic.PlasticInternalUtils;
import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry5.ioc.services.ClassFabUtils;
-import org.apache.tapestry5.ioc.services.ClassFactory;
+import org.apache.tapestry5.ioc.services.PlasticProxyFactory;
import org.apache.tapestry5.ioc.services.TypeCoercer;
import org.apache.tapestry5.services.ComponentLayer;
import org.apache.tapestry5.services.InvalidationListener;
@@ -27,14 +27,14 @@ public class ComponentClassCacheImpl imp
{
private final Map<String, Class> cache = CollectionFactory.newConcurrentMap();
- private final ClassFactory classFactory;
+ private final PlasticProxyFactory plasticFactory;
private final TypeCoercer typeCoercer;
public ComponentClassCacheImpl(@ComponentLayer
- ClassFactory classFactory, TypeCoercer typeCoercer)
+ PlasticProxyFactory plasticFactory, TypeCoercer typeCoercer)
{
- this.classFactory = classFactory;
+ this.plasticFactory = plasticFactory;
this.typeCoercer = typeCoercer;
}
@@ -72,21 +72,10 @@ public class ComponentClassCacheImpl imp
private Class lookupClassForType(String className)
{
- if (className.equals("void"))
- return void.class;
-
- if (ClassFabUtils.isPrimitiveType(className))
- return ClassFabUtils.getPrimitiveType(className);
-
- // This step is necessary to handle primitives arrays.
-
- String jvmName = ClassFabUtils.toJVMBinaryName(className);
-
- ClassLoader componentLoader = classFactory.getClassLoader();
-
+ ClassLoader componentLoader = plasticFactory.getClassLoader();
try
{
- return Class.forName(jvmName, true, componentLoader);
+ return PlasticInternalUtils.toClass(componentLoader, className);
}
catch (ClassNotFoundException ex)
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/XMLTokenType.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/XMLTokenType.java?rev=1140454&r1=1140453&r2=1140454&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/XMLTokenType.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/XMLTokenType.java Tue Jun 28 06:51:27 2011
@@ -15,7 +15,7 @@
package org.apache.tapestry5.internal.services;
/**
- * Identifies type of {@link XMLToken}.
+ * Identifies type of {@link org.apache.tapestry5.internal.services.XMLToken}.
*
* @since 5.2.0
*/
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ParameterConduit.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ParameterConduit.java?rev=1140454&r1=1140453&r2=1140454&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ParameterConduit.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ParameterConduit.java Tue Jun 28 06:51:27 2011
@@ -50,7 +50,7 @@ public interface ParameterConduit extend
/**
* Determines if the parameter is actually bound.
*
- * @return
+ * @return true if bound
*/
boolean isBound();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/BaseURLSource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/BaseURLSource.java?rev=1140454&r1=1140453&r2=1140454&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/BaseURLSource.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/BaseURLSource.java Tue Jun 28 06:51:27 2011
@@ -32,7 +32,7 @@ import org.apache.tapestry5.ioc.services
* context to be available. If you contribute specific values for the specified SymbolConstants, it's safe to use
* the default implementation of this service outside of request context, for example in a batch job. For
* {@link org.apache.tapestry5.SymbolConstants#HOSTNAME}, a value starting with a dollar sign ($) will be resolved
- * using {@link java.langSystem#getEnv()} - contributing "$HOSTNAME" for {@link org.apache.tapestry5.SymbolConstants#HOSTNAME}
+ * using {@link java.lang.System#getenv()} - contributing "$HOSTNAME" for {@link org.apache.tapestry5.SymbolConstants#HOSTNAME}
* is the most sensible choice for a dynamic value that doesn't use
* {@link org.apache.tapestry5.services.Request#getServerName()}.
*/
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/BeanBlockContribution.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/BeanBlockContribution.java?rev=1140454&r1=1140453&r2=1140454&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/BeanBlockContribution.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/BeanBlockContribution.java Tue Jun 28 06:51:27 2011
@@ -33,7 +33,7 @@ public class BeanBlockContribution
/**
* @deprecated Use {@link DisplayBlockContribution#DisplayBlockContribution(String, String, String)} or
- * {@link EditBlockContribution#EditorBlockContribution(String, String, String)} instead. To be
+ * {@link EditBlockContribution#EditBlockContribution(String, String, String)} instead. To be
* removed after Tapestry 5.2.
*/
public BeanBlockContribution(String dataType, String pageName, String blockId, boolean edit)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/BeanBlockSource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/BeanBlockSource.java?rev=1140454&r1=1140453&r2=1140454&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/BeanBlockSource.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/BeanBlockSource.java Tue Jun 28 06:51:27 2011
@@ -30,7 +30,7 @@ import org.apache.tapestry5.ioc.annotati
* org.apache.tapestry5.services.BeanBlockOverrideSource} service allows these to be overridden.
*
* @see org.apache.tapestry5.services.DataTypeAnalyzer
- * @see org.apache.tapestry5.services.TapestryModule#contributeBeanBlockSource(org.apache.tapestry5.ioc.Configuration)
+ * @see org.apache.tapestry5.services.TapestryModule#provideDefaultBeanBlocks(org.apache.tapestry5.ioc.Configuration)
*/
@UsesConfiguration(BeanBlockContribution.class)
public interface BeanBlockSource
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ClassTransformation.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ClassTransformation.java?rev=1140454&r1=1140453&r2=1140454&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ClassTransformation.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ClassTransformation.java Tue Jun 28 06:51:27 2011
@@ -54,8 +54,8 @@ import org.slf4j.Logger;
* The majority of methods concern the <em>declared</em> members (field and methods) of a specific class, rather than
* any fields or methods inherited from a base class.
*
- * @see org.apache.tapestry5.services.TapestryModule#contributeComponentClassTransformWorker(org.apache.tapestry5.ioc.OrderedConfiguration,
- * org.apache.tapestry5.ioc.ObjectLocator, InjectionProvider, ComponentClassResolver)
+ * @see org.apache.tapestry5.services.TapestryModule#provideOldStyleCassTransformWorkers(
+ * org.apache.tapestry5.ioc.OrderedConfiguration, org.apache.tapestry5.services.meta.MetaWorker, ComponentClassResolver)
* @deprecated In 5.3
* @see {@link PlasticClass}
*/
@@ -153,7 +153,6 @@ public interface ClassTransformation ext
/**
* Returns true if the indicated name is a private instance field.
*
- * @param fieldName
* @return true if field exists
*/
boolean isField(String fieldName);
@@ -199,7 +198,6 @@ public interface ClassTransformation ext
* will be passed the {@link ComponentResources} and will return the final value; thus
* each component <em>instance</em> will receive a matching unique instance via the provider.
*
- * @param <T>
* @param type
* type of value to inject
* @param suggestedName
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/TapestryIOCModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/TapestryIOCModule.java?rev=1140454&r1=1140453&r2=1140454&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/TapestryIOCModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/TapestryIOCModule.java Tue Jun 28 06:51:27 2011
@@ -349,7 +349,7 @@ public final class TapestryIOCModule
{
public Boolean coerce(Long input)
{
- return input.longValue() != 0;
+ return !input.equals(0L);
}
});
@@ -537,7 +537,7 @@ public final class TapestryIOCModule
if (!threadPoolEnabled)
return new NonParallelExecutor();
- LinkedBlockingQueue workQueue = new LinkedBlockingQueue(queueSize);
+ LinkedBlockingQueue<Runnable> workQueue = new LinkedBlockingQueue<Runnable>(queueSize);
final ThreadPoolExecutor executorService = new ThreadPoolExecutor(coreSize, maxSize, keepAliveMillis,
TimeUnit.MILLISECONDS, workQueue);