Author: gseitz
Date: Mon Oct 15 15:47:38 2007
New Revision: 584953
URL: http://svn.apache.org/viewvc?rev=584953&view=rev
Log:
WICKET-1078
Modified:
wicket/trunk/jdk-1.4/wicket-ioc/.settings/org.eclipse.jdt.core.prefs
wicket/trunk/jdk-1.4/wicket-ioc/.settings/org.eclipse.jdt.ui.prefs
wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/injection/ComponentInjector.java
wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/injection/CompoundFieldValueFactory.java
wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/injection/ConfigurableInjector.java
wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/injection/IFieldValueFactory.java
wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/injection/Injector.java
wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/injection/NoopFieldValueFactory.java
wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/injection/web/InjectorHolder.java
wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/proxy/ILazyInitProxy.java
wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/proxy/IProxyTargetLocator.java
wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/proxy/LazyInitProxyFactory.java
wicket/trunk/jdk-1.4/wicket-ioc/src/test/java/org/apache/wicket/injection/CompoundFieldValueFactoryTest.java
wicket/trunk/jdk-1.4/wicket-ioc/src/test/java/org/apache/wicket/injection/InjectorTest.java
wicket/trunk/jdk-1.4/wicket-ioc/src/test/java/org/apache/wicket/injection/NoopFieldValueFactoryTest.java
wicket/trunk/jdk-1.4/wicket-ioc/src/test/java/org/apache/wicket/proxy/LazyInitProxyFactoryTest.java
wicket/trunk/jdk-1.4/wicket-ioc/src/test/java/org/apache/wicket/proxy/util/IObjectMethodTester.java
Modified: wicket/trunk/jdk-1.4/wicket-ioc/.settings/org.eclipse.jdt.core.prefs
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-ioc/.settings/org.eclipse.jdt.core.prefs?rev=584953&r1=584952&r2=584953&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-ioc/.settings/org.eclipse.jdt.core.prefs
(original)
+++ wicket/trunk/jdk-1.4/wicket-ioc/.settings/org.eclipse.jdt.core.prefs Mon
Oct 15 15:47:38 2007
@@ -122,7 +122,7 @@
org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.line_length=100
org.eclipse.jdt.core.formatter.compact_else_if=true
org.eclipse.jdt.core.formatter.continuation_indentation=2
org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
Modified: wicket/trunk/jdk-1.4/wicket-ioc/.settings/org.eclipse.jdt.ui.prefs
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-ioc/.settings/org.eclipse.jdt.ui.prefs?rev=584953&r1=584952&r2=584953&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-ioc/.settings/org.eclipse.jdt.ui.prefs
(original)
+++ wicket/trunk/jdk-1.4/wicket-ioc/.settings/org.eclipse.jdt.ui.prefs Mon Oct
15 15:47:38 2007
@@ -13,4 +13,52 @@
formatter_profile=_wicket
formatter_settings_version=11
internal.default.compliance=default
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0"
encoding\="UTF-8"?><templates><template autoinsert\="false"
context\="gettercomment_context" deleted\="false" description\="Comment for
getter method" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment"
name\="gettercomment">/**\n * Gets ${bare_field_name}.\n * @return
${bare_field_name}\n */</template><template autoinsert\="false"
context\="settercomment_context" deleted\="false" description\="Comment for
setter method" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.settercomment"
name\="settercomment">/**\n * Sets ${bare_field_name}.\n * @param ${param}
${bare_field_name}\n */</template><template autoinsert\="false"
context\="constructorcomment_context" deleted\="false" description\="Comment
for created constructors" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment"
name\="constructorcomment">/**\n * Construct.\n * ${tags}\n */</template><templa
te autoinsert\="false" context\="filecomment_context" deleted\="false"
description\="Comment for created Java files" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.filecomment"
name\="filecomment"></template><template autoinsert\="false"
context\="typecomment_context" deleted\="false" description\="Comment for
created types" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.typecomment"
name\="typecomment">/**\n * @author ${user}\n * ${tags}\n
*/</template><template autoinsert\="true" context\="fieldcomment_context"
deleted\="false" description\="Comment for fields" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment"
name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true"
context\="methodcomment_context" deleted\="false" description\="Comment for
non-overriding methods" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment"
name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\
="false" context\="overridecomment_context" deleted\="false"
description\="Comment for overriding methods" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment"
name\="overridecomment">/**\n * ${see_to_overridden}\n */</template><template
autoinsert\="false" context\="newtype_context" deleted\="false"
description\="Newly created files" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*\n *
Licensed to the Apache Software Foundation (ASF) under one or more\n *
contributor license agreements. See the NOTICE file distributed with\n * this
work for additional information regarding copyright ownership.\n * The ASF
licenses this file to You under the Apache License, Version 2.0\n * (the
"License"); you may not use this file except in compliance with\n * the
License. You may obtain a copy of the License at\n *\n *
http\://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by
applicable law or agreed to in wri
ting, software\n * distributed under the License is distributed on an "AS IS"
BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.\n * See the License for the specific language governing permissions
and\n * limitations under the License.\n
*/\n${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template
autoinsert\="false" context\="catchblock_context" deleted\="false"
description\="Code in new catch blocks" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">throw
new RuntimeException(${exception_var});</template><template autoinsert\="false"
context\="methodbody_context" deleted\="false" description\="Code in created
method stubs" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.methodbody"
name\="methodbody">${body_statement}</template><template autoinsert\="false"
context\="constructorbody_context" deleted\="false" description\="Code in
created constructor
stubs" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody"
name\="constructorbody">${body_statement}</template><template
autoinsert\="true" context\="getterbody_context" deleted\="false"
description\="Code in created getters" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.getterbody"
name\="getterbody">return ${field};</template><template autoinsert\="true"
context\="setterbody_context" deleted\="false" description\="Code in created
setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody"
name\="setterbody">${field} \= ${param};</template><template autoinsert\="true"
context\="classbody_context" deleted\="false" description\="Code in new class
type bodies" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.classbody"
name\="classbody">\n</template><template autoinsert\="true"
context\="interfacebody_context" deleted\="false" description\="Code in new
interface type bodies" enabled\="true" id\="org.eclipse.jdt
.ui.text.codetemplates.interfacebody"
name\="interfacebody">\n</template><template autoinsert\="true"
context\="enumbody_context" deleted\="false" description\="Code in new enum
type bodies" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.enumbody"
name\="enumbody">\n</template><template autoinsert\="true"
context\="annotationbody_context" deleted\="false" description\="Code in new
annotation type bodies" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody"
name\="annotationbody">\n</template><template autoinsert\="true"
context\="delegatecomment_context" deleted\="false" description\="Comment for
delegate methods" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment"
name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n
*/</template></templates>
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0"
encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false"
context\="gettercomment_context" deleted\="false" description\="Comment for
getter method" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment"
name\="gettercomment">/**\r\n * Gets ${bare_field_name}.\r\n * @return
${bare_field_name}\r\n */</template><template autoinsert\="false"
context\="settercomment_context" deleted\="false" description\="Comment for
setter method" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.settercomment"
name\="settercomment">/**\r\n * Sets ${bare_field_name}.\r\n * @param ${param}
${bare_field_name}\r\n */</template><template autoinsert\="false"
context\="constructorcomment_context" deleted\="false" description\="Comment
for created constructors" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment"
name\="constructorcomment">/**\r\n * Construct.\r\n
* ${tags}\r\n */</template><template autoinsert\="false"
context\="filecomment_context" deleted\="false" description\="Comment for
created Java files" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.filecomment"
name\="filecomment"/><template autoinsert\="false"
context\="typecomment_context" deleted\="false" description\="Comment for
created types" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.typecomment"
name\="typecomment">/**\r\n * @author ${user}\r\n * ${tags}\r\n
*/</template><template autoinsert\="true" context\="fieldcomment_context"
deleted\="false" description\="Comment for fields" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment"
name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true"
context\="methodcomment_context" deleted\="false" description\="Comment for
non-overriding methods" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment"
name\="methodcomment">/**\r\n * ${tags}
\r\n */</template><template autoinsert\="false"
context\="overridecomment_context" deleted\="false" description\="Comment for
overriding methods" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment"
name\="overridecomment">/**\r\n * ${see_to_overridden}\r\n
*/</template><template autoinsert\="false" context\="newtype_context"
deleted\="false" description\="Newly created files" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*\r\n *
Licensed to the Apache Software Foundation (ASF) under one or more\r\n *
contributor license agreements. See the NOTICE file distributed with\r\n *
this work for additional information regarding copyright ownership.\r\n * The
ASF licenses this file to You under the Apache License, Version 2.0\r\n * (the
"License"); you may not use this file except in compliance with\r\n * the
License. You may obtain a copy of the License at\r\n *\r\n *
http\://www.apache.org/licenses/LICENSE-2.0\r\
n *\r\n * Unless required by applicable law or agreed to in writing,
software\r\n * distributed under the License is distributed on an "AS IS"
BASIS,\r\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.\r\n * See the License for the specific language governing permissions
and\r\n * limitations under the License.\r\n
*/\r\n${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template
autoinsert\="false" context\="catchblock_context" deleted\="false"
description\="Code in new catch blocks" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">throw
new RuntimeException(${exception_var});</template><template autoinsert\="false"
context\="methodbody_context" deleted\="false" description\="Code in created
method stubs" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.methodbody"
name\="methodbody">${body_statement}</template><template autoinsert\="false"
context\="c
onstructorbody_context" deleted\="false" description\="Code in created
constructor stubs" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody"
name\="constructorbody">${body_statement}</template><template
autoinsert\="true" context\="getterbody_context" deleted\="false"
description\="Code in created getters" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.getterbody"
name\="getterbody">return ${field};</template><template autoinsert\="true"
context\="setterbody_context" deleted\="false" description\="Code in created
setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody"
name\="setterbody">${field} \= ${param};</template><template autoinsert\="true"
context\="classbody_context" deleted\="false" description\="Code in new class
type bodies" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.classbody"
name\="classbody">\r\n</template><template autoinsert\="true"
context\="interfacebody_context" deleted\="false"
description\="Code in new interface type bodies" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody"
name\="interfacebody">\r\n</template><template autoinsert\="true"
context\="enumbody_context" deleted\="false" description\="Code in new enum
type bodies" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.enumbody"
name\="enumbody">\r\n</template><template autoinsert\="true"
context\="annotationbody_context" deleted\="false" description\="Code in new
annotation type bodies" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody"
name\="annotationbody">\r\n</template><template autoinsert\="true"
context\="delegatecomment_context" deleted\="false" description\="Comment for
delegate methods" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment"
name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n
*/</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.format_source_code=true
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
Modified:
wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/injection/ComponentInjector.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/injection/ComponentInjector.java?rev=584953&r1=584952&r2=584953&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/injection/ComponentInjector.java
(original)
+++
wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/injection/ComponentInjector.java
Mon Oct 15 15:47:38 2007
@@ -21,9 +21,8 @@
import org.apache.wicket.injection.web.InjectorHolder;
/**
- * Enables your application to do Spring dependency injection. To use, register
- * the injector as a [EMAIL PROTECTED]
org.apache.wicket.application.IComponentInstantiationListener}
- * like this:
+ * Enables your application to do Spring dependency injection. To use,
register the injector as a
+ * [EMAIL PROTECTED]
org.apache.wicket.application.IComponentInstantiationListener} like this:
*
* <pre>
* ... (in your application's constructor or init method)
Modified:
wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/injection/CompoundFieldValueFactory.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/injection/CompoundFieldValueFactory.java?rev=584953&r1=584952&r2=584953&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/injection/CompoundFieldValueFactory.java
(original)
+++
wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/injection/CompoundFieldValueFactory.java
Mon Oct 15 15:47:38 2007
@@ -22,9 +22,8 @@
import java.util.List;
/**
- * Compound implementation of IFieldValueFactory. This field value factory will
- * keep trying added factories until one returns a non-null value or all are
- * tried.
+ * Compound implementation of IFieldValueFactory. This field value factory
will keep trying added
+ * factories until one returns a non-null value or all are tried.
*
*
* @see IFieldValueFactory
@@ -111,7 +110,7 @@
Iterator it = delegates.iterator();
while (it.hasNext())
{
- final IFieldValueFactory factory = (IFieldValueFactory)
it.next();
+ final IFieldValueFactory factory =
(IFieldValueFactory)it.next();
Object object = factory.getFieldValue(field,
fieldOwner);
if (object != null)
{
@@ -129,8 +128,9 @@
Iterator it = delegates.iterator();
while (it.hasNext())
{
- final IFieldValueFactory factory = (IFieldValueFactory)
it.next();
- if (factory.supportsField(field)) {
+ final IFieldValueFactory factory =
(IFieldValueFactory)it.next();
+ if (factory.supportsField(field))
+ {
return true;
}
}
Modified:
wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/injection/ConfigurableInjector.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/injection/ConfigurableInjector.java?rev=584953&r1=584952&r2=584953&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/injection/ConfigurableInjector.java
(original)
+++
wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/injection/ConfigurableInjector.java
Mon Oct 15 15:47:38 2007
@@ -17,10 +17,10 @@
package org.apache.wicket.injection;
/**
- * Abstract injector that allows subclasses to provide IFieldValueFactory
- * pragmatically by implementing getFieldValueFactory(). Allows for injectors
- * that can be used with inject(Object obj) call instead of inject(Object obj,
- * IFieldValueFactory factory), thereby allowing for default factories.
+ * Abstract injector that allows subclasses to provide IFieldValueFactory
pragmatically by
+ * implementing getFieldValueFactory(). Allows for injectors that can be used
with inject(Object
+ * obj) call instead of inject(Object obj, IFieldValueFactory factory),
thereby allowing for default
+ * factories.
*
* @author Igor Vaynberg (ivaynberg)
*
@@ -28,8 +28,7 @@
public abstract class ConfigurableInjector extends Injector
{
/**
- * Injects proxies using IFieldValueFactory obtained by calling
- * getFieldValueFactory() method
+ * Injects proxies using IFieldValueFactory obtained by calling
getFieldValueFactory() method
*
* @param object
* object to be injected
Modified:
wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/injection/IFieldValueFactory.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/injection/IFieldValueFactory.java?rev=584953&r1=584952&r2=584953&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/injection/IFieldValueFactory.java
(original)
+++
wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/injection/IFieldValueFactory.java
Mon Oct 15 15:47:38 2007
@@ -19,8 +19,7 @@
import java.lang.reflect.Field;
/**
- * Factory object used by injector to generate values for fields of the object
- * being injected.
+ * Factory object used by injector to generate values for fields of the object
being injected.
*
* @author Igor Vaynberg (ivaynberg)
*
@@ -40,16 +39,13 @@
Object getFieldValue(Field field, Object fieldOwner);
/**
- * Returns true if the factory can generate a value for the field, false
- * otherwise.
+ * Returns true if the factory can generate a value for the field,
false otherwise.
*
- * If this method returns false, getFieldValue() will not be called on
this
- * factory
+ * If this method returns false, getFieldValue() will not be called on
this factory
*
* @param field
* field
- * @return true if the factory can generate a value for the field, false
- * otherwise
+ * @return true if the factory can generate a value for the field,
false otherwise
*/
boolean supportsField(Field field);
}
Modified:
wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/injection/Injector.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/injection/Injector.java?rev=584953&r1=584952&r2=584953&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/injection/Injector.java
(original)
+++
wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/injection/Injector.java
Mon Oct 15 15:47:38 2007
@@ -29,8 +29,8 @@
/**
* Injector scans fields of an object instance and checks if the specified
- * [EMAIL PROTECTED] IFieldValueFactory} can provide a value for a field; if
it can, the
- * field is set to that value. Injector will ignore all non-null fields.
+ * [EMAIL PROTECTED] IFieldValueFactory} can provide a value for a field; if
it can, the field is set to that
+ * value. Injector will ignore all non-null fields.
*
* @author Igor Vaynberg (ivaynberg)
*
@@ -39,7 +39,8 @@
{
private static Injector instance = new Injector();
- // FIXME: WICKET-625 - Wicket doesn't clean up properly when
hot-deploying; hangs onto Class references.
+ // FIXME: WICKET-625 - Wicket doesn't clean up properly when
hot-deploying;
+ // hangs onto Class references.
// We need some way to clean out this hashmap when we're done.
private ConcurrentHashMap/* <Class, Field[]> */classToFields = new
ConcurrentHashMap();
@@ -52,11 +53,11 @@
}
/**
- * When the initializer traverses the hierarchy of the specified object
it
- * will stop if it encounters a boundary class.
+ * When the initializer traverses the hierarchy of the specified object
it will stop if it
+ * encounters a boundary class.
*
- * By default, more common wicket classes are defined as boundaries so
that
- * the initializer does not waste time traversing them.
+ * By default, more common wicket classes are defined as boundaries so
that the initializer does
+ * not waste time traversing them.
*
* @param clazz
* class to be tested for being a boundary class
@@ -64,9 +65,8 @@
*/
protected boolean isBoundaryClass(Class clazz)
{
- if (clazz.equals(WebPage.class)
- || clazz.equals(Page.class) ||
clazz.equals(Panel.class)
- || clazz.equals(MarkupContainer.class) ||
clazz.equals(Component.class))
+ if (clazz.equals(WebPage.class) || clazz.equals(Page.class) ||
clazz.equals(Panel.class) ||
+ clazz.equals(MarkupContainer.class) ||
clazz.equals(Component.class))
{
return true;
}
@@ -74,8 +74,8 @@
}
/**
- * traverse fields in the class hierarchy of the object and set their
value
- * with a locator provided by the locator factory.
+ * traverse fields in the class hierarchy of the object and set their
value with a locator
+ * provided by the locator factory.
*
* @param object
* @param factory
@@ -84,7 +84,7 @@
public Object inject(Object object, IFieldValueFactory factory)
{
Class clazz = object.getClass();
- Field[] fields = (Field[]) classToFields.get(clazz);
+ Field[] fields = (Field[])classToFields.get(clazz);
if (fields == null)
{
fields = findFields(clazz, factory);
@@ -115,15 +115,13 @@
}
catch (IllegalArgumentException e)
{
- throw new RuntimeException("error while
injecting object ["
- + object.toString() + "] of
type [" + object.getClass().getName()
- + "]", e);
+ throw new RuntimeException("error while
injecting object [" + object.toString() +
+ "] of type [" +
object.getClass().getName() + "]", e);
}
catch (IllegalAccessException e)
{
- throw new RuntimeException("error while
injecting object ["
- + object.toString() + "] of
type [" + object.getClass().getName()
- + "]", e);
+ throw new RuntimeException("error while
injecting object [" + object.toString() +
+ "] of type [" +
object.getClass().getName() + "]", e);
}
}
@@ -131,13 +129,11 @@
}
/**
- * Returns an array of fields that can be injected using the given field
- * value factory
+ * Returns an array of fields that can be injected using the given
field value factory
*
* @param clazz
* @param factory
- * @return an array of fields that can be injected using the given field
- * value factory
+ * @return an array of fields that can be injected using the given
field value factory
*/
private Field[] findFields(Class clazz, IFieldValueFactory factory)
{
@@ -158,7 +154,7 @@
clazz = clazz.getSuperclass();
}
- return (Field[]) matched.toArray(new Field[matched.size()]);
+ return (Field[])matched.toArray(new Field[matched.size()]);
}
}
Modified:
wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/injection/NoopFieldValueFactory.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/injection/NoopFieldValueFactory.java?rev=584953&r1=584952&r2=584953&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/injection/NoopFieldValueFactory.java
(original)
+++
wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/injection/NoopFieldValueFactory.java
Mon Oct 15 15:47:38 2007
@@ -22,13 +22,14 @@
* Implementation of field value factory that ignores all fields
*
* @author Igor Vaynberg (ivaynberg)
- *
+ *
*/
public class NoopFieldValueFactory implements IFieldValueFactory
{
/**
- * @see
org.apache.wicket.injection.IFieldValueFactory#getFieldValue(java.lang.reflect.Field,
java.lang.Object)
+ * @see
org.apache.wicket.injection.IFieldValueFactory#getFieldValue(java.lang.reflect.Field,
+ * java.lang.Object)
*/
public Object getFieldValue(Field field, Object fieldOwner)
{
Modified:
wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/injection/web/InjectorHolder.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/injection/web/InjectorHolder.java?rev=584953&r1=584952&r2=584953&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/injection/web/InjectorHolder.java
(original)
+++
wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/injection/web/InjectorHolder.java
Mon Oct 15 15:47:38 2007
@@ -19,12 +19,12 @@
import org.apache.wicket.injection.ConfigurableInjector;
/**
- * Holds a reference to the injector that will be used to automatically
- * initialize components that are used. Usually the application class should
set
- * the injector in the holder when it initializes.
+ * Holds a reference to the injector that will be used to automatically
initialize components that
+ * are used. Usually the application class should set the injector in the
holder when it
+ * initializes.
* <p>
- * This class can be used for unit-testing to switch the standard injector with
- * an injector that will lookup dependencies from a mock application context.
+ * This class can be used for unit-testing to switch the standard injector
with an injector that
+ * will lookup dependencies from a mock application context.
* <p>
*
* <pre>
@@ -61,11 +61,10 @@
{
if (injector == null)
{
- throw new IllegalStateException(
- "InjectorHolder has not been assigned
an injector. "
- + "Use
InjectorHolder.setInjector() to assign an injector. "
- + "In most cases this
should be done once inside "
- + "SpringWebApplication
subclass's init() method.");
+ throw new IllegalStateException("InjectorHolder has not
been assigned an injector. "
+ + "Use InjectorHolder.setInjector() to
assign an injector. "
+ + "In most cases this should be done
once inside "
+ + "SpringWebApplication subclass's
init() method.");
}
return injector;
}
Modified:
wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/proxy/ILazyInitProxy.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/proxy/ILazyInitProxy.java?rev=584953&r1=584952&r2=584953&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/proxy/ILazyInitProxy.java
(original)
+++
wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/proxy/ILazyInitProxy.java
Mon Oct 15 15:47:38 2007
@@ -19,8 +19,8 @@
import org.apache.wicket.IClusterable;
/**
- * Interface the lazy init proxies implement to make identification of the
proxy
- * and retrival of [EMAIL PROTECTED] IProxyTargetLocator} possible.
+ * Interface the lazy init proxies implement to make identification of the
proxy and retrival of
+ * [EMAIL PROTECTED] IProxyTargetLocator} possible.
*
* @author Igor Vaynberg (ivaynberg)
*
Modified:
wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/proxy/IProxyTargetLocator.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/proxy/IProxyTargetLocator.java?rev=584953&r1=584952&r2=584953&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/proxy/IProxyTargetLocator.java
(original)
+++
wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/proxy/IProxyTargetLocator.java
Mon Oct 15 15:47:38 2007
@@ -19,15 +19,14 @@
import org.apache.wicket.IClusterable;
/**
- * Represents a service locator for lazy init proxies. When the first method
- * invocation occurs on the lazy init proxy this locator will be used to
- * retrieve the proxy target object that will receive the method invocation.
+ * Represents a service locator for lazy init proxies. When the first method
invocation occurs on
+ * the lazy init proxy this locator will be used to retrieve the proxy target
object that will
+ * receive the method invocation.
* <p>
- * Generally implementations should be small when serialized because the main
- * purpose of lazy init proxies is to be stored in session when the wicket
pages
- * are serialized, and when deserialized to be able to lookup the dependency
- * again. The smaller the implementation of IProxyTargetLocator the less the
- * drain on session size.
+ * Generally implementations should be small when serialized because the main
purpose of lazy init
+ * proxies is to be stored in session when the wicket pages are serialized,
and when deserialized to
+ * be able to lookup the dependency again. The smaller the implementation of
IProxyTargetLocator the
+ * less the drain on session size.
* <p>
* A small implementation may use a static lookup to retrieve the target
object.
* <p>
@@ -38,7 +37,7 @@
* {
* Object locateProxyObject()
* {
- * MyApplication app = (MyApplication) Application.get();
+ * MyApplication app = (MyApplication)Application.get();
* return app.getUserService();
* }
* }
@@ -52,8 +51,7 @@
public interface IProxyTargetLocator extends IClusterable
{
/**
- * Returns the object that will be used as target object for a lazy init
- * proxy.
+ * Returns the object that will be used as target object for a lazy
init proxy.
*
* @return retrieved object
*/
Modified:
wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/proxy/LazyInitProxyFactory.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/proxy/LazyInitProxyFactory.java?rev=584953&r1=584952&r2=584953&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/proxy/LazyInitProxyFactory.java
(original)
+++
wicket/trunk/jdk-1.4/wicket-ioc/src/main/java/org/apache/wicket/proxy/LazyInitProxyFactory.java
Mon Oct 15 15:47:38 2007
@@ -34,25 +34,22 @@
import org.apache.wicket.model.IModel;
/**
- * A factory class that creates lazy init proxies given a type and a
- * [EMAIL PROTECTED] IProxyTargetLocator} used to retrieve the object the
proxy will
- * represent.
+ * A factory class that creates lazy init proxies given a type and a [EMAIL
PROTECTED] IProxyTargetLocator}
+ * used to retrieve the object the proxy will represent.
* <p>
* A lazy init proxy waits until the first method invocation before it uses the
- * [EMAIL PROTECTED] IProxyTargetLocator} to retrieve the object to which the
method
- * invocation will be forwarded.
+ * [EMAIL PROTECTED] IProxyTargetLocator} to retrieve the object to which the
method invocation will be
+ * forwarded.
* <p>
- * This factory creates two kinds of proxies: A standard dynamic proxy when the
- * specified type is an interface, and a CGLib proxy when the specified type is
- * a concrete class.
+ * This factory creates two kinds of proxies: A standard dynamic proxy when
the specified type is an
+ * interface, and a CGLib proxy when the specified type is a concrete class.
* <p>
- * The general use case for such a proxy is to represent a dependency that
- * should not be serialized with a wicket page or [EMAIL PROTECTED] IModel}.
The solution
- * is to serialize the proxy and the [EMAIL PROTECTED] IProxyTargetLocator}
instead of the
- * dependency, and be able to look up the target object again when the proxy is
- * deserialized and accessed. A good strategy for achieving this is to have a
- * static lookup in the [EMAIL PROTECTED] IProxyTargetLocator}, this keeps its
size small
- * and makes it safe to serialize.
+ * The general use case for such a proxy is to represent a dependency that
should not be serialized
+ * with a wicket page or [EMAIL PROTECTED] IModel}. The solution is to
serialize the proxy and the
+ * [EMAIL PROTECTED] IProxyTargetLocator} instead of the dependency, and be
able to look up the target object
+ * again when the proxy is deserialized and accessed. A good strategy for
achieving this is to have
+ * a static lookup in the [EMAIL PROTECTED] IProxyTargetLocator}, this keeps
its size small and makes it safe
+ * to serialize.
* <p>
* Example:
*
@@ -94,9 +91,8 @@
*
* </pre>
*
- * The detachable model in the example above follows to good citizen pattern
and
- * is easy to unit test. These are the advantages gained through the use of the
- * lazy init proxies.
+ * The detachable model in the example above follows to good citizen pattern
and is easy to unit
+ * test. These are the advantages gained through the use of the lazy init
proxies.
*
* @author Igor Vaynberg (ivaynberg)
*
@@ -112,15 +108,14 @@
boolean.class, Boolean.class });
/**
- * Create a lazy init proxy for the specified type. The target object
will
- * be located using the provided locator upon first method invocation.
+ * Create a lazy init proxy for the specified type. The target object
will be located using the
+ * provided locator upon first method invocation.
*
* @param type
* type that proxy will represent
*
* @param locator
- * object locator that will locate the object the proxy
- * represents
+ * object locator that will locate the object the proxy
represents
*
* @return lazily initializable proxy
*/
@@ -145,10 +140,9 @@
catch (IllegalArgumentException e)
{
/*
- * STW: In some clustering environments it
appears the context
- * classloader fails to load the proxied
interface (currently
- * seen in BEA WLS 9.x clusters). If this
happens, we can try
- * and fall back to the classloader (current)
that actually
+ * STW: In some clustering environments it
appears the context classloader fails to
+ * load the proxied interface (currently seen
in BEA WLS 9.x clusters). If this
+ * happens, we can try and fall back to the
classloader (current) that actually
* loaded this class.
*/
return
Proxy.newProxyInstance(LazyInitProxyFactory.class.getClassLoader(),
@@ -174,10 +168,10 @@
}
/**
- * This interface is used to make the proxy forward writeReplace() call
to
- * the handler instead of invoking it on itself. This allows us to
serialize
- * the replacement objet instead of the proxy itself in case the proxy
- * subclass is deserialized on a VM that does not have it created.
+ * This interface is used to make the proxy forward writeReplace() call
to the handler instead
+ * of invoking it on itself. This allows us to serialize the
replacement objet instead of the
+ * proxy itself in case the proxy subclass is deserialized on a VM that
does not have it
+ * created.
*
* @see ProxyReplacement
*
@@ -196,9 +190,8 @@
}
/**
- * Object that replaces the proxy when it is serialized. Upon
- * deserialization this object will create a new proxy with the same
- * locator.
+ * Object that replaces the proxy when it is serialized. Upon
deserialization this object will
+ * create a new proxy with the same locator.
*
* @author Igor Vaynberg (ivaynberg)
*
@@ -241,8 +234,8 @@
}
/**
- * Method interceptor for proxies representing concrete object not
backed by
- * an interface. These proxies are representing by cglib proxies.
+ * Method interceptor for proxies representing concrete object not
backed by an interface. These
+ * proxies are representing by cglib proxies.
*
* @author Igor Vaynberg (ivaynberg)
*
@@ -269,8 +262,7 @@
* class of the object this proxy was created for
*
* @param locator
- * object locator used to locate the object this
proxy
- * represents
+ * object locator used to locate the object this
proxy represents
*/
public CGLibInterceptor(Class type, IProxyTargetLocator locator)
{
@@ -281,8 +273,7 @@
/**
* @see
net.sf.cglib.proxy.MethodInterceptor#intercept(java.lang.Object,
- * java.lang.reflect.Method, java.lang.Object[],
- * net.sf.cglib.proxy.MethodProxy)
+ * java.lang.reflect.Method, java.lang.Object[],
net.sf.cglib.proxy.MethodProxy)
*/
public Object intercept(Object object, Method method, Object[]
args, MethodProxy proxy)
throws Throwable
@@ -339,8 +330,8 @@
}
/**
- * Invocation handler for proxies representing interface based object.
For
- * interface backed objects dynamic jdk proxies are used.
+ * Invocation handler for proxies representing interface based object.
For interface backed
+ * objects dynamic jdk proxies are used.
*
* @author Igor Vaynberg (ivaynberg)
*
@@ -367,8 +358,7 @@
* class of object this handler will represent
*
* @param locator
- * object locator used to locate the object this
proxy
- * represents
+ * object locator used to locate the object this
proxy represents
*/
public JdkHandler(Class type, IProxyTargetLocator locator)
{
@@ -448,8 +438,7 @@
*
* @param method
* method being tested
- * @return true if the method is derived from Object.equals(), false
- * otherwise
+ * @return true if the method is derived from Object.equals(), false
otherwise
*/
protected static boolean isEqualsMethod(Method method)
{
@@ -462,8 +451,7 @@
*
* @param method
* method being tested
- * @return true if the method is defined from Object.hashCode(), false
- * otherwise
+ * @return true if the method is defined from Object.hashCode(), false
otherwise
*/
protected static boolean isHashCodeMethod(Method method)
{
@@ -476,8 +464,7 @@
*
* @param method
* method being tested
- * @return true if the method is defined from Object.toString(), false
- * otherwise
+ * @return true if the method is defined from Object.toString(), false
otherwise
*/
protected static boolean isToStringMethod(Method method)
{
@@ -490,8 +477,7 @@
*
* @param method
* method being tested
- * @return true if the method is defined from Object.finalize(), false
- * otherwise
+ * @return true if the method is defined from Object.finalize(), false
otherwise
*/
protected static boolean isFinalizeMethod(Method method)
{
Modified:
wicket/trunk/jdk-1.4/wicket-ioc/src/test/java/org/apache/wicket/injection/CompoundFieldValueFactoryTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-ioc/src/test/java/org/apache/wicket/injection/CompoundFieldValueFactoryTest.java?rev=584953&r1=584952&r2=584953&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket-ioc/src/test/java/org/apache/wicket/injection/CompoundFieldValueFactoryTest.java
(original)
+++
wicket/trunk/jdk-1.4/wicket-ioc/src/test/java/org/apache/wicket/injection/CompoundFieldValueFactoryTest.java
Mon Oct 15 15:47:38 2007
@@ -22,8 +22,6 @@
import junit.framework.TestCase;
-import org.apache.wicket.injection.CompoundFieldValueFactory;
-import org.apache.wicket.injection.IFieldValueFactory;
import org.easymock.MockControl;
/**
@@ -49,7 +47,7 @@
for (int i = 0; i < 4; i++)
{
ctrl[i] =
MockControl.createControl(IFieldValueFactory.class);
- fact[i] = (IFieldValueFactory) ctrl[i].getMock();
+ fact[i] = (IFieldValueFactory)ctrl[i].getMock();
}
}
@@ -76,14 +74,14 @@
public void testArrayConstructor()
{
prepare(2);
- CompoundFieldValueFactory f = new CompoundFieldValueFactory(
- new IFieldValueFactory[] {fact[0], fact[1]});
+ CompoundFieldValueFactory f = new CompoundFieldValueFactory(new
IFieldValueFactory[] {
+ fact[0], fact[1] });
f.getFieldValue(field, this);
verify(2);
try
{
- f = new
CompoundFieldValueFactory((IFieldValueFactory[]) null);
+ f = new
CompoundFieldValueFactory((IFieldValueFactory[])null);
fail();
}
catch (IllegalArgumentException e)
@@ -98,15 +96,14 @@
public void testListConstructor()
{
prepare(4);
- List list = Arrays.asList(new IFieldValueFactory[] {fact[0],
fact[1], fact[2],
- fact[3]});
+ List list = Arrays.asList(new IFieldValueFactory[] { fact[0],
fact[1], fact[2], fact[3] });
CompoundFieldValueFactory f = new
CompoundFieldValueFactory(list);
f.getFieldValue(field, this);
verify(4);
try
{
- f = new CompoundFieldValueFactory((List) null);
+ f = new CompoundFieldValueFactory((List)null);
fail();
}
catch (IllegalArgumentException e)
@@ -156,8 +153,7 @@
ctrl[2].expectAndReturn(fact[2].getFieldValue(field, this), new
Object());
ctrl[2].replay();
ctrl[3].replay();
- List list = Arrays.asList(new IFieldValueFactory[] {fact[0],
fact[1], fact[2],
- fact[3]});
+ List list = Arrays.asList(new IFieldValueFactory[] { fact[0],
fact[1], fact[2], fact[3] });
CompoundFieldValueFactory f = new
CompoundFieldValueFactory(list);
f.getFieldValue(field, this);
@@ -171,8 +167,8 @@
public void testAdd()
{
prepare(3);
- CompoundFieldValueFactory f = new CompoundFieldValueFactory(
- new IFieldValueFactory[] {fact[0], fact[1]});
+ CompoundFieldValueFactory f = new CompoundFieldValueFactory(new
IFieldValueFactory[] {
+ fact[0], fact[1] });
f.addFactory(fact[2]);
f.getFieldValue(field, this);
verify(3);
Modified:
wicket/trunk/jdk-1.4/wicket-ioc/src/test/java/org/apache/wicket/injection/InjectorTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-ioc/src/test/java/org/apache/wicket/injection/InjectorTest.java?rev=584953&r1=584952&r2=584953&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket-ioc/src/test/java/org/apache/wicket/injection/InjectorTest.java
(original)
+++
wicket/trunk/jdk-1.4/wicket-ioc/src/test/java/org/apache/wicket/injection/InjectorTest.java
Mon Oct 15 15:47:38 2007
@@ -18,13 +18,11 @@
import java.lang.reflect.Field;
-import org.apache.wicket.injection.IFieldValueFactory;
-import org.apache.wicket.injection.Injector;
+import junit.framework.TestCase;
+
import org.apache.wicket.injection.util.InternalTestObject;
import org.apache.wicket.injection.util.MockDependency;
import org.apache.wicket.injection.util.TestObject;
-
-import junit.framework.TestCase;
/**
* Tests [EMAIL PROTECTED] Injector}
Modified:
wicket/trunk/jdk-1.4/wicket-ioc/src/test/java/org/apache/wicket/injection/NoopFieldValueFactoryTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-ioc/src/test/java/org/apache/wicket/injection/NoopFieldValueFactoryTest.java?rev=584953&r1=584952&r2=584953&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket-ioc/src/test/java/org/apache/wicket/injection/NoopFieldValueFactoryTest.java
(original)
+++
wicket/trunk/jdk-1.4/wicket-ioc/src/test/java/org/apache/wicket/injection/NoopFieldValueFactoryTest.java
Mon Oct 15 15:47:38 2007
@@ -18,8 +18,6 @@
import java.lang.reflect.Field;
-import org.apache.wicket.injection.NoopFieldValueFactory;
-
import junit.framework.TestCase;
/**
Modified:
wicket/trunk/jdk-1.4/wicket-ioc/src/test/java/org/apache/wicket/proxy/LazyInitProxyFactoryTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-ioc/src/test/java/org/apache/wicket/proxy/LazyInitProxyFactoryTest.java?rev=584953&r1=584952&r2=584953&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket-ioc/src/test/java/org/apache/wicket/proxy/LazyInitProxyFactoryTest.java
(original)
+++
wicket/trunk/jdk-1.4/wicket-ioc/src/test/java/org/apache/wicket/proxy/LazyInitProxyFactoryTest.java
Mon Oct 15 15:47:38 2007
@@ -18,9 +18,8 @@
import java.lang.reflect.Proxy;
-import org.apache.wicket.proxy.ILazyInitProxy;
-import org.apache.wicket.proxy.IProxyTargetLocator;
-import org.apache.wicket.proxy.LazyInitProxyFactory;
+import junit.framework.TestCase;
+
import org.apache.wicket.proxy.LazyInitProxyFactory.ProxyReplacement;
import org.apache.wicket.proxy.util.ConcreteObject;
import org.apache.wicket.proxy.util.IInterface;
@@ -29,8 +28,6 @@
import org.apache.wicket.proxy.util.ObjectMethodTester;
import org.apache.wicket.util.lang.Objects;
-import junit.framework.TestCase;
-
/**
* Tests lazy init proxy factory
*
@@ -46,6 +43,7 @@
private static IProxyTargetLocator interfaceObjectLocator = new
IProxyTargetLocator()
{
private static final long serialVersionUID = 1L;
+
public Object locateProxyTarget()
{
return LazyInitProxyFactoryTest.interfaceObject;
@@ -55,6 +53,7 @@
private static IProxyTargetLocator concreteObjectLocator = new
IProxyTargetLocator()
{
private static final long serialVersionUID = 1L;
+
public Object locateProxyTarget()
{
return LazyInitProxyFactoryTest.concreteObject;
@@ -64,6 +63,7 @@
private static IProxyTargetLocator stringObjectLocator = new
IProxyTargetLocator()
{
private static final long serialVersionUID = 1L;
+
public Object locateProxyTarget()
{
return "StringLiteral";
@@ -76,21 +76,21 @@
public void testInterfaceProxy()
{
// test proxy creation for an interface class
- IInterface proxy = (IInterface)
LazyInitProxyFactory.createProxy(
- IInterface.class, interfaceObjectLocator);
+ IInterface proxy =
(IInterface)LazyInitProxyFactory.createProxy(IInterface.class,
+ interfaceObjectLocator);
// test we have a jdk dynamic proxy
assertTrue(Proxy.isProxyClass(proxy.getClass()));
// test proxy implements ILazyInitProxy
assertTrue(proxy instanceof ILazyInitProxy);
- assertTrue(((ILazyInitProxy) proxy).getObjectLocator() ==
interfaceObjectLocator);
+ assertTrue(((ILazyInitProxy)proxy).getObjectLocator() ==
interfaceObjectLocator);
// test method invocation
assertEquals(proxy.getMessage(), "interface");
// test serialization
- IInterface proxy2 = (IInterface) Objects.cloneObject(proxy);
+ IInterface proxy2 = (IInterface)Objects.cloneObject(proxy);
assertTrue(proxy != proxy2);
assertEquals(proxy2.getMessage(), "interface");
@@ -101,14 +101,15 @@
IProxyTargetLocator testerLocator = new IProxyTargetLocator()
{
private static final long serialVersionUID = 1L;
+
public Object locateProxyTarget()
{
return tester;
}
};
- IObjectMethodTester testerProxy = (IObjectMethodTester)
LazyInitProxyFactory
- .createProxy(IObjectMethodTester.class, testerLocator);
+ IObjectMethodTester testerProxy =
(IObjectMethodTester)LazyInitProxyFactory.createProxy(
+ IObjectMethodTester.class, testerLocator);
testerProxy.equals(this);
testerProxy.hashCode();
testerProxy.toString();
@@ -120,12 +121,12 @@
*/
public void testConcreteProxy()
{
- ConcreteObject proxy = (ConcreteObject)
LazyInitProxyFactory.createProxy(
+ ConcreteObject proxy =
(ConcreteObject)LazyInitProxyFactory.createProxy(
ConcreteObject.class, concreteObjectLocator);
// test proxy implements ILazyInitProxy
assertTrue(proxy instanceof ILazyInitProxy);
- assertTrue(((ILazyInitProxy) proxy).getObjectLocator() ==
concreteObjectLocator);
+ assertTrue(((ILazyInitProxy)proxy).getObjectLocator() ==
concreteObjectLocator);
// test we do not have a jdk dynamic proxy
assertFalse(Proxy.isProxyClass(proxy.getClass()));
@@ -134,7 +135,7 @@
assertEquals(proxy.getMessage(), "concrete");
// test serialization
- ConcreteObject proxy2 = (ConcreteObject)
Objects.cloneObject(proxy);
+ ConcreteObject proxy2 =
(ConcreteObject)Objects.cloneObject(proxy);
assertTrue(proxy != proxy2);
assertEquals(proxy2.getMessage(), "concrete");
@@ -145,14 +146,15 @@
IProxyTargetLocator testerLocator = new IProxyTargetLocator()
{
private static final long serialVersionUID = 1L;
+
public Object locateProxyTarget()
{
return tester;
}
};
- ObjectMethodTester testerProxy = (ObjectMethodTester)
LazyInitProxyFactory
- .createProxy(ObjectMethodTester.class, testerLocator);
+ ObjectMethodTester testerProxy =
(ObjectMethodTester)LazyInitProxyFactory.createProxy(
+ ObjectMethodTester.class, testerLocator);
testerProxy.equals(this);
testerProxy.hashCode();
testerProxy.toString();
@@ -164,10 +166,10 @@
*/
public void testCGLibInterceptorReplacement()
{
- ProxyReplacement ser = new ProxyReplacement(
- ConcreteObject.class.getName(),
concreteObjectLocator);
+ ProxyReplacement ser = new
ProxyReplacement(ConcreteObject.class.getName(),
+ concreteObjectLocator);
- ConcreteObject proxy2 = (ConcreteObject)
Objects.cloneObject(ser);
+ ConcreteObject proxy2 =
(ConcreteObject)Objects.cloneObject(ser);
assertEquals(proxy2.getMessage(), "concrete");
}
@@ -176,7 +178,8 @@
*/
public void testStringProxy()
{
- // We special-case String objects to avoid proxying them, as
they're final.
+ // We special-case String objects to avoid proxying them, as
they're
+ // final.
// See WICKET-603.
String proxy =
(String)LazyInitProxyFactory.createProxy(String.class, stringObjectLocator);
assertEquals("StringLiteral", proxy);
Modified:
wicket/trunk/jdk-1.4/wicket-ioc/src/test/java/org/apache/wicket/proxy/util/IObjectMethodTester.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-ioc/src/test/java/org/apache/wicket/proxy/util/IObjectMethodTester.java?rev=584953&r1=584952&r2=584953&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket-ioc/src/test/java/org/apache/wicket/proxy/util/IObjectMethodTester.java
(original)
+++
wicket/trunk/jdk-1.4/wicket-ioc/src/test/java/org/apache/wicket/proxy/util/IObjectMethodTester.java
Mon Oct 15 15:47:38 2007
@@ -17,8 +17,7 @@
package org.apache.wicket.proxy.util;
/**
- * Tester object that is valid as long as equals/hashCode/toString have not
been
- * called on it.
+ * Tester object that is valid as long as equals/hashCode/toString have not
been called on it.
*
* @author Igor Vaynberg (ivaynberg)
*
