You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2006/11/21 08:46:04 UTC
svn commit: r477546 [2/2] - in /tapestry/tapestry5/tapestry-ioc/trunk:
.settings/ src/main/java/org/apache/tapestry/ioc/
src/main/java/org/apache/tapestry/ioc/annotations/
src/main/java/org/apache/tapestry/ioc/def/
src/main/java/org/apache/tapestry/ioc...
Copied: tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/ClassFabUtils.java (from r477483, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/services/ClassFabUtils.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/ClassFabUtils.java?view=diff&rev=477546&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/services/ClassFabUtils.java&r1=477483&p2=tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/ClassFabUtils.java&r2=477546
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/services/ClassFabUtils.java (original)
+++ tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/ClassFabUtils.java Mon Nov 20 23:45:58 2006
@@ -61,8 +61,7 @@
*/
public static String getJavaClassName(Class inputClass)
{
- if (inputClass.isArray())
- return getJavaClassName(inputClass.getComponentType()) + "[]";
+ if (inputClass.isArray()) return getJavaClassName(inputClass.getComponentType()) + "[]";
return inputClass.getName();
}
@@ -73,11 +72,9 @@
*/
public static boolean isToString(Method method)
{
- if (!method.getName().equals("toString"))
- return false;
+ if (!method.getName().equals("toString")) return false;
- if (method.getParameterTypes().length > 0)
- return false;
+ if (method.getParameterTypes().length > 0) return false;
return method.getReturnType().equals(String.class);
}
@@ -86,11 +83,11 @@
{
private final String _typeCode;
- private final String _wrapperType;
+ private final Class _wrapperType;
private final String _unwrapMethod;
- public PrimitiveInfo(String typeCode, String wrapperType, String unwrapMethod)
+ public PrimitiveInfo(String typeCode, Class wrapperType, String unwrapMethod)
{
_typeCode = typeCode;
_wrapperType = wrapperType;
@@ -107,7 +104,7 @@
return _unwrapMethod;
}
- public String getWrapperType()
+ public Class getWrapperType()
{
return _wrapperType;
}
@@ -117,17 +114,17 @@
static
{
- add("boolean", "Z", "java.lang.Boolean", "booleanValue");
- add("short", "S", "java.lang.Short", "shortValue");
- add("int", "I", "java.lang.Integer", "intValue");
- add("long", "J", "java.lang.Long", "longValue");
- add("float", "F", "java.lang.Float", "floatValue");
- add("double", "D", "java.lang.Double", "doubleValue");
- add("char", "C", "java.lang.Character", "charValue");
- add("byte", "B", "java.lang.Byte", "byteValue");
+ add("boolean", "Z", Boolean.class, "booleanValue");
+ add("short", "S", Short.class, "shortValue");
+ add("int", "I", Integer.class, "intValue");
+ add("long", "J", Long.class, "longValue");
+ add("float", "F", Float.class, "floatValue");
+ add("double", "D", Double.class, "doubleValue");
+ add("char", "C", Character.class, "charValue");
+ add("byte", "B", Byte.class, "byteValue");
}
- private static void add(String primitiveType, String typeCode, String wrapperType,
+ private static void add(String primitiveType, String typeCode, Class wrapperType,
String unwrapMethod)
{
PRIMITIVE_INFO.put(primitiveType, new PrimitiveInfo(typeCode, wrapperType, unwrapMethod));
@@ -141,8 +138,7 @@
public static String getJVMClassName(String type)
{
// if it is not an array, just return the type itself
- if (!type.endsWith("[]"))
- return type;
+ if (!type.endsWith("[]")) return type;
// if it is an array, convert it to JavaVM-style format
StringBuilder buffer = new StringBuilder();
@@ -180,6 +176,6 @@
public static String getWrapperType(String primitiveType)
{
- return PRIMITIVE_INFO.get(primitiveType).getWrapperType();
+ return PRIMITIVE_INFO.get(primitiveType).getWrapperType().getName();
}
}
Copied: tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/TapestryIOCModule.java (from r477483, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/services/TapestryIOCModule.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/TapestryIOCModule.java?view=diff&rev=477546&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/services/TapestryIOCModule.java&r1=477483&p2=tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/TapestryIOCModule.java&r2=477546
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/services/TapestryIOCModule.java (original)
+++ tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/TapestryIOCModule.java Mon Nov 20 23:45:58 2006
@@ -21,7 +21,6 @@
import java.util.List;
import java.util.Map;
-import org.apache.tapestry.internal.services.ComponentInstantiatorSource;
import org.apache.tapestry.ioc.Configuration;
import org.apache.tapestry.ioc.MappedConfiguration;
import org.apache.tapestry.ioc.ObjectProvider;
Modified: tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/util/StrategyRegistry.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/util/StrategyRegistry.java?view=diff&rev=477546&r1=477483&r2=477546
==============================================================================
--- tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/util/StrategyRegistry.java (original)
+++ tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/util/StrategyRegistry.java Mon Nov 20 23:45:58 2006
@@ -17,11 +17,11 @@
import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newThreadSafeMap;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.tapestry.internal.util.InheritanceSearch;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.tapestry.ioc.internal.util.InheritanceSearch;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
/**
Modified: tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/util/UtilMessages.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/util/UtilMessages.java?view=diff&rev=477546&r1=477483&r2=477546
==============================================================================
--- tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/util/UtilMessages.java (original)
+++ tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/util/UtilMessages.java Mon Nov 20 23:45:58 2006
@@ -14,8 +14,8 @@
package org.apache.tapestry.ioc.util;
-import org.apache.tapestry.internal.MessagesImpl;
import org.apache.tapestry.ioc.Messages;
+import org.apache.tapestry.ioc.internal.util.MessagesImpl;
/**
* Static messages
@@ -27,8 +27,6 @@
private UtilMessages()
{
}
-
-
static String noStrategyAdapter(Class inputType, Class adapterType, String catalog)
{
Copied: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/Bar.java (from r477464, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/Bar.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/Bar.java?view=diff&rev=477546&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/Bar.java&r1=477464&p2=tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/Bar.java&r2=477546
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/Bar.java (original)
+++ tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/Bar.java Mon Nov 20 23:45:58 2006
@@ -12,7 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
+package org.apache.tapestry.ioc.internal.util;
+
/**
* Used by {@link InheritanceSearchTest}.
Copied: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/BarImpl.java (from r477464, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/BarImpl.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/BarImpl.java?view=diff&rev=477546&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/BarImpl.java&r1=477464&p2=tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/BarImpl.java&r2=477546
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/BarImpl.java (original)
+++ tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/BarImpl.java Mon Nov 20 23:45:58 2006
@@ -12,7 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
+package org.apache.tapestry.ioc.internal.util;
+
/**
* Used by {@link InheritanceSearchTest}.
Copied: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/Foo.java (from r477464, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/Foo.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/Foo.java?view=diff&rev=477546&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/Foo.java&r1=477464&p2=tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/Foo.java&r2=477546
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/Foo.java (original)
+++ tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/Foo.java Mon Nov 20 23:45:58 2006
@@ -12,7 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
+package org.apache.tapestry.ioc.internal.util;
+
/**
* Used by {@link InheritanceSearchTest}.
Copied: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/FooBar.java (from r477464, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/FooBar.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/FooBar.java?view=diff&rev=477546&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/FooBar.java&r1=477464&p2=tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/FooBar.java&r2=477546
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/FooBar.java (original)
+++ tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/FooBar.java Mon Nov 20 23:45:58 2006
@@ -12,7 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
+package org.apache.tapestry.ioc.internal.util;
+
/**
* Used by {@link InheritanceSearchTest}.
Copied: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/FooBarImpl.java (from r477464, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/FooBarImpl.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/FooBarImpl.java?view=diff&rev=477546&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/FooBarImpl.java&r1=477464&p2=tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/FooBarImpl.java&r2=477546
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/FooBarImpl.java (original)
+++ tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/FooBarImpl.java Mon Nov 20 23:45:58 2006
@@ -12,7 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
+package org.apache.tapestry.ioc.internal.util;
+
/**
* Used by {@link InheritanceSearchTest}.
Copied: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/FooImpl.java (from r477464, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/FooImpl.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/FooImpl.java?view=diff&rev=477546&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/FooImpl.java&r1=477464&p2=tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/FooImpl.java&r2=477546
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/FooImpl.java (original)
+++ tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/FooImpl.java Mon Nov 20 23:45:58 2006
@@ -12,7 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
+package org.apache.tapestry.ioc.internal.util;
+
/**
* Used by {@link InheritanceSearchTest}.
Copied: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/InheritanceSearchTest.java (from r477483, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/InheritanceSearchTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/InheritanceSearchTest.java?view=diff&rev=477546&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/InheritanceSearchTest.java&r1=477483&p2=tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/InheritanceSearchTest.java&r2=477546
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/InheritanceSearchTest.java (original)
+++ tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/InheritanceSearchTest.java Mon Nov 20 23:45:58 2006
@@ -12,14 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
+package org.apache.tapestry.ioc.internal.util;
-import java.io.Serializable;
-import java.util.List;
-
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import java.io.Serializable;
+import java.util.List;
+
import org.apache.tapestry.ioc.test.TestBase;
-import org.testng.annotations.Test;
+import org.testng.annotations.Test;
/**
*