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 2008/05/11 19:00:08 UTC
svn commit: r655338 [4/5] - in /tapestry/tapestry5/trunk:
tapestry-component-report/src/main/java/org/apache/tapestry/mojo/
tapestry-core/src/main/java/org/apache/tapestry/
tapestry-core/src/main/java/org/apache/tapestry/corelib/base/
tapestry-core/src...
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/BeanModelSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/BeanModelSourceImplTest.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/BeanModelSourceImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/BeanModelSourceImplTest.java Sun May 11 10:00:04 2008
@@ -35,12 +35,12 @@
*/
public class BeanModelSourceImplTest extends InternalBaseTestCase
{
- private BeanModelSource _source;
+ private BeanModelSource source;
@BeforeClass
public void setup()
{
- _source = getObject(BeanModelSource.class, null);
+ source = getObject(BeanModelSource.class, null);
}
/**
@@ -57,7 +57,7 @@
replay();
- BeanModel model = _source.create(SimpleBean.class, true, resources);
+ BeanModel model = source.create(SimpleBean.class, true, resources);
assertSame(model.getBeanType(), SimpleBean.class);
@@ -114,7 +114,7 @@
replay();
- BeanModel model = _source.create(SimpleBean.class, true, resources);
+ BeanModel model = source.create(SimpleBean.class, true, resources);
assertSame(model.getBeanType(), SimpleBean.class);
@@ -144,7 +144,7 @@
replay();
- BeanModel model = _source.create(SimpleBean.class, true, resources);
+ BeanModel model = source.create(SimpleBean.class, true, resources);
assertEquals(model.getPropertyNames(), Arrays.asList("firstName", "lastName", "age"));
@@ -175,7 +175,7 @@
replay();
- BeanModel<SimpleBean> model = _source.create(SimpleBean.class, true, resources);
+ BeanModel<SimpleBean> model = source.create(SimpleBean.class, true, resources);
SimpleBean s1 = model.newInstance();
@@ -200,7 +200,7 @@
replay();
- BeanModel model = _source.create(SimpleBean.class, true, resources);
+ BeanModel model = source.create(SimpleBean.class, true, resources);
model.exclude("firstname");
@@ -236,7 +236,7 @@
replay();
- BeanModel model = _source.create(SimpleBean.class, true, resources);
+ BeanModel model = source.create(SimpleBean.class, true, resources);
assertEquals(model.getPropertyNames(), Arrays.asList("firstName", "lastName", "age"));
@@ -262,11 +262,11 @@
replay();
- BeanModel model = _source.create(ReadOnlyBean.class, true, resources);
+ BeanModel model = source.create(ReadOnlyBean.class, true, resources);
assertEquals(model.getPropertyNames(), Arrays.asList("value"));
- model = _source.create(ReadOnlyBean.class, false, resources);
+ model = source.create(ReadOnlyBean.class, false, resources);
assertEquals(model.getPropertyNames(), Arrays.asList("value", "readOnly"));
@@ -284,7 +284,7 @@
replay();
- BeanModel model = _source.create(EnumBean.class, true, resources);
+ BeanModel model = source.create(EnumBean.class, true, resources);
assertEquals(model.getPropertyNames(), Arrays.asList("token"));
@@ -304,7 +304,7 @@
replay();
- BeanModel model = _source.create(SimpleBean.class, true, resources);
+ BeanModel model = source.create(SimpleBean.class, true, resources);
try
{
@@ -331,7 +331,7 @@
replay();
- BeanModel model = _source.create(SimpleBean.class, true, resources);
+ BeanModel model = source.create(SimpleBean.class, true, resources);
try
{
@@ -358,7 +358,7 @@
replay();
- BeanModel model = _source.create(SimpleBean.class, true, resources);
+ BeanModel model = source.create(SimpleBean.class, true, resources);
model.add("shrub.foo()", null);
@@ -388,7 +388,7 @@
replay();
- BeanModel model = _source.create(SimpleBean.class, true, resources);
+ BeanModel model = source.create(SimpleBean.class, true, resources);
PropertyModel pm = model.add("shrub.foo()", null);
@@ -408,7 +408,7 @@
replay();
- BeanModel model = _source.create(SimpleBean.class, true, resources);
+ BeanModel model = source.create(SimpleBean.class, true, resources);
PropertyModel pm = model.add("shrub.foo()", null);
@@ -429,7 +429,7 @@
replay();
- BeanModel model = _source.create(StoogeBean.class, true, resources);
+ BeanModel model = source.create(StoogeBean.class, true, resources);
assertEquals(model.getPropertyNames(), Arrays.asList("larry", "moe", "shemp", "curly"));
@@ -447,7 +447,7 @@
replay();
- BeanModel model = _source.create(SimpleBean.class, true, resources).get("age").label("Decrepitude").model();
+ BeanModel model = source.create(SimpleBean.class, true, resources).get("age").label("Decrepitude").model();
assertEquals(model.get("age").getLabel(), "Decrepitude");
@@ -468,7 +468,7 @@
replay();
- BeanModel model = _source.create(SimpleBean.class, true, resources);
+ BeanModel model = source.create(SimpleBean.class, true, resources);
assertEquals(model.get("age").getLabel(), "Decrepitude");
@@ -486,7 +486,7 @@
replay();
- BeanModel model = _source.create(StringArrayBean.class, true, resources);
+ BeanModel model = source.create(StringArrayBean.class, true, resources);
// There's not editor for string arrays yet, so it won't show up normally.
@@ -523,7 +523,7 @@
replay();
- BeanModel model = _source.create(CompositeBean.class, true, resources);
+ BeanModel model = source.create(CompositeBean.class, true, resources);
// No editor for CompositeBean, so this will be empty.
@@ -564,7 +564,7 @@
replay();
- BeanModel model = _source.create(WriteOnlyBean.class, false, resources);
+ BeanModel model = source.create(WriteOnlyBean.class, false, resources);
assertEquals(model.getPropertyNames(), Arrays.asList("readOnly", "readWrite"));
@@ -582,7 +582,7 @@
replay();
- BeanModel model = _source.create(SimpleBean.class, true, resources);
+ BeanModel model = source.create(SimpleBean.class, true, resources);
PropertyModel property = model.add("placeholder", null);
@@ -604,7 +604,7 @@
replay();
- BeanModel model = _source.create(SimpleBean.class, true, resources);
+ BeanModel model = source.create(SimpleBean.class, true, resources);
assertSame(model.exclude("age"), model);
@@ -624,7 +624,7 @@
replay();
- BeanModel model = _source.create(SimpleBean.class, true, resources);
+ BeanModel model = source.create(SimpleBean.class, true, resources);
assertSame(model.exclude("frobozz"), model);
@@ -644,7 +644,7 @@
replay();
- BeanModel model = _source.create(NonVisualBean.class, true, resources);
+ BeanModel model = source.create(NonVisualBean.class, true, resources);
assertEquals(model.getPropertyNames(), Arrays.asList("name"));
@@ -662,7 +662,7 @@
replay();
- BeanModel model = _source.create(SimpleBean.class, true, resources);
+ BeanModel model = source.create(SimpleBean.class, true, resources);
assertSame(model.getBeanType(), SimpleBean.class);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentEventDispatcherTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentEventDispatcherTest.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentEventDispatcherTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentEventDispatcherTest.java Sun May 11 10:00:04 2008
@@ -27,12 +27,12 @@
public class ComponentEventDispatcherTest extends InternalBaseTestCase
{
- private ContextValueEncoder _contextValueEncoder;
+ private ContextValueEncoder contextValueEncoder;
@BeforeClass
public void setup()
{
- _contextValueEncoder = getService(ContextValueEncoder.class);
+ contextValueEncoder = getService(ContextValueEncoder.class);
}
@Test
@@ -144,7 +144,7 @@
ComponentEventRequestParameters expectedParameters = new ComponentEventRequestParameters("mypage", "mypage", "",
"eventname",
new URLEventContext(
- _contextValueEncoder,
+ contextValueEncoder,
new String[] {
"alpha",
"beta" }),
@@ -164,7 +164,7 @@
replay();
- Dispatcher dispatcher = new ComponentEventDispatcher(handler, resolver, _contextValueEncoder,
+ Dispatcher dispatcher = new ComponentEventDispatcher(handler, resolver, contextValueEncoder,
requestEncodingInitializer);
assertTrue(dispatcher.dispatch(request, response));
@@ -200,7 +200,7 @@
replay();
- Dispatcher dispatcher = new ComponentEventDispatcher(handler, resolver, _contextValueEncoder,
+ Dispatcher dispatcher = new ComponentEventDispatcher(handler, resolver, contextValueEncoder,
requestEncodingInitializer);
assertTrue(dispatcher.dispatch(request, response));
@@ -245,7 +245,7 @@
eventType,
new EmptyEventContext(),
new URLEventContext(
- _contextValueEncoder,
+ contextValueEncoder,
eventContext));
train_getPath(request, requestPath);
@@ -257,12 +257,12 @@
train_getParameter(request, InternalConstants.CONTAINER_PAGE_NAME, null);
requestEncodingInitializer.initializeRequestEncoding(containerPageName);
-
+
handler.handle(expectedParameters);
replay();
- Dispatcher dispatcher = new ComponentEventDispatcher(handler, resolver, _contextValueEncoder,
+ Dispatcher dispatcher = new ComponentEventDispatcher(handler, resolver, contextValueEncoder,
requestEncodingInitializer);
assertTrue(dispatcher.dispatch(request, response));
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentEventImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentEventImplTest.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentEventImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentEventImplTest.java Sun May 11 10:00:04 2008
@@ -26,18 +26,18 @@
public class ComponentEventImplTest extends InternalBaseTestCase
{
- private TypeCoercer _coercer;
+ private TypeCoercer coercer;
@BeforeClass
public void setup_coercer()
{
- _coercer = getObject(TypeCoercer.class, null);
+ coercer = getObject(TypeCoercer.class, null);
}
@AfterClass
public void cleanup_coercer()
{
- _coercer = null;
+ coercer = null;
}
@Test
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImplTest.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImplTest.java Sun May 11 10:00:04 2008
@@ -45,22 +45,21 @@
*/
public class ComponentInstantiatorSourceImplTest extends InternalBaseTestCase
{
- private static final ClassLoader _contextLoader = Thread.currentThread()
- .getContextClassLoader();
+ private static final ClassLoader contextLoader = Thread.currentThread().getContextClassLoader();
private static final String SYNTH_COMPONENT_CLASSNAME = "org.apache.tapestry.internal.transform.pages.SynthComponent";
- private File _extraClasspath;
+ private File extraClasspath;
- private ComponentInstantiatorSource _source;
+ private ComponentInstantiatorSource source;
- private Registry _registry;
+ private Registry registry;
- private PropertyAccess _access;
+ private PropertyAccess access;
- private ClassLoader _extraLoader;
+ private ClassLoader extraLoader;
- private String _tempDir;
+ private String tempDir;
@Test
public void controlled_packages() throws Exception
@@ -70,7 +69,7 @@
replay();
- ComponentInstantiatorSourceImpl e = new ComponentInstantiatorSourceImpl(logger, _contextLoader, transformer,
+ ComponentInstantiatorSourceImpl e = new ComponentInstantiatorSourceImpl(logger, contextLoader, transformer,
null);
assertEquals(e.inControlledPackage("foo.bar.Baz"), false);
@@ -107,24 +106,24 @@
// Should not be an instance, since it is loaded by a different class loader.
assertFalse(BasicComponent.class.isInstance(target));
- _access.set(target, "value", "some default value");
- assertEquals(_access.get(target, "value"), "some default value");
+ access.set(target, "value", "some default value");
+ assertEquals(access.get(target, "value"), "some default value");
- _access.set(target, "retainedValue", "some retained value");
- assertEquals(_access.get(target, "retainedValue"), "some retained value");
+ access.set(target, "retainedValue", "some retained value");
+ assertEquals(access.get(target, "retainedValue"), "some retained value");
// Setting a property value before pageDidLoad will cause that value
// to be the default when the page detaches.
target.containingPageDidLoad();
- _access.set(target, "value", "some transient value");
- assertEquals(_access.get(target, "value"), "some transient value");
+ access.set(target, "value", "some transient value");
+ assertEquals(access.get(target, "value"), "some transient value");
target.containingPageDidDetach();
- assertEquals(_access.get(target, "value"), "some default value");
- assertEquals(_access.get(target, "retainedValue"), "some retained value");
+ assertEquals(access.get(target, "value"), "some default value");
+ assertEquals(access.get(target, "retainedValue"), "some retained value");
}
@Test
@@ -134,16 +133,16 @@
target.containingPageDidLoad();
- _access.set(target, "value", "base class");
- assertEquals(_access.get(target, "value"), "base class");
+ access.set(target, "value", "base class");
+ assertEquals(access.get(target, "value"), "base class");
- _access.set(target, "intValue", 33);
- assertEquals(_access.get(target, "intValue"), 33);
+ access.set(target, "intValue", 33);
+ assertEquals(access.get(target, "intValue"), 33);
target.containingPageDidDetach();
- assertNull(_access.get(target, "value"));
- assertEquals(_access.get(target, "intValue"), 0);
+ assertNull(access.get(target, "value"));
+ assertEquals(access.get(target, "intValue"), 0);
}
/**
@@ -154,19 +153,19 @@
{
// Ensure it doesn't already exist:
- assertFalse(_source.exists(SYNTH_COMPONENT_CLASSNAME));
+ assertFalse(source.exists(SYNTH_COMPONENT_CLASSNAME));
// Create the class on the fly.
createSynthComponentClass("Original");
- assertTrue(_source.exists(SYNTH_COMPONENT_CLASSNAME));
+ assertTrue(source.exists(SYNTH_COMPONENT_CLASSNAME));
Named named = (Named) createComponent(SYNTH_COMPONENT_CLASSNAME);
assertEquals(named.getName(), "Original");
- String path = _tempDir + "/" + SYNTH_COMPONENT_CLASSNAME.replace('.', '/') + ".class";
+ String path = tempDir + "/" + SYNTH_COMPONENT_CLASSNAME.replace('.', '/') + ".class";
URL url = new File(path).toURL();
long dtm = readDTM(url);
@@ -182,7 +181,7 @@
// Detect the change and clear out the internal caches
- UpdateListenerHub hub = _registry.getService("UpdateListenerHub", UpdateListenerHub.class);
+ UpdateListenerHub hub = registry.getService("UpdateListenerHub", UpdateListenerHub.class);
hub.fireUpdateEvent();
@@ -207,7 +206,7 @@
ClassPool pool = new ClassPool();
// Inside Maven Surefire, the system classpath is not sufficient to find all
// the necessary files.
- pool.appendClassPath(new LoaderClassPath(_extraLoader));
+ pool.appendClassPath(new LoaderClassPath(extraLoader));
CtClass ctClass = pool.makeClass(SYNTH_COMPONENT_CLASSNAME);
@@ -220,7 +219,7 @@
ctClass.addInterface(pool.get(Named.class.getName()));
- ctClass.writeFile(_extraClasspath.getAbsolutePath());
+ ctClass.writeFile(extraClasspath.getAbsolutePath());
}
private Component createComponent(Class componentClass)
@@ -236,7 +235,7 @@
replay();
- Instantiator inst = _source.findInstantiator(classname);
+ Instantiator inst = source.findInstantiator(classname);
Component target = inst.newInstance(resources);
@@ -251,17 +250,17 @@
String tempdir = System.getProperty("java.io.tmpdir");
String uid = UUID.randomUUID().toString();
- _tempDir = tempdir + "/tapestry-test-classpath/" + uid;
- _extraClasspath = new File(_tempDir);
+ tempDir = tempdir + "/tapestry-test-classpath/" + uid;
+ extraClasspath = new File(tempDir);
- System.out.println("Creating dir: " + _extraClasspath);
+ System.out.println("Creating dir: " + extraClasspath);
- _extraClasspath.mkdirs();
+ extraClasspath.mkdirs();
- URL url = _extraClasspath.toURL();
+ URL url = extraClasspath.toURL();
- _extraLoader = new URLClassLoader(new URL[] { url }, _contextLoader);
- RegistryBuilder builder = new RegistryBuilder(_extraLoader);
+ extraLoader = new URLClassLoader(new URL[] { url }, contextLoader);
+ RegistryBuilder builder = new RegistryBuilder(extraLoader);
builder.add(TapestryModule.class);
@@ -273,23 +272,23 @@
builder.add(module);
- _registry = builder.build();
+ registry = builder.build();
- // _registry.getService("Alias", Alias.class).setMode("servlet");
+ // registry.getService("Alias", Alias.class).setMode("servlet");
- _source = _registry.getService(ComponentInstantiatorSource.class);
- _access = _registry.getService(PropertyAccess.class);
+ source = registry.getService(ComponentInstantiatorSource.class);
+ access = registry.getService(PropertyAccess.class);
- _source.addPackage("org.apache.tapestry.internal.transform.pages");
+ source.addPackage("org.apache.tapestry.internal.transform.pages");
}
@AfterClass
public void cleanup_tests()
{
- _registry.shutdown();
+ registry.shutdown();
- _registry = null;
- _source = null;
- _access = null;
+ registry = null;
+ source = null;
+ access = null;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentMessagesSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentMessagesSourceImplTest.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentMessagesSourceImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentMessagesSourceImplTest.java Sun May 11 10:00:04 2008
@@ -26,8 +26,8 @@
import java.util.Locale;
/**
- * Tests {@link ComponentMessagesSourceImpl} as well as {@link MessagesSourceImpl} (which contains
- * code refactored out of CMSI).
+ * Tests {@link ComponentMessagesSourceImpl} as well as {@link MessagesSourceImpl} (which contains code refactored out
+ * of CMSI).
*/
@Test(sequential = true)
public class ComponentMessagesSourceImplTest extends InternalBaseTestCase
@@ -36,13 +36,13 @@
private static final String SIMPLE_COMPONENT_CLASS_NAME = "org.apache.tapestry.internal.services.SimpleComponent";
- private final URLChangeTracker _tracker = new URLChangeTracker();
+ private final URLChangeTracker tracker = new URLChangeTracker();
- private final Resource _simpleComponentResource = new ClasspathResource(
+ private final Resource simpleComponentResource = new ClasspathResource(
"org/apache/tapestry/internal/services/SimpleComponent.class");
- private final ComponentMessagesSourceImpl _source = new ComponentMessagesSourceImpl(
- _simpleComponentResource, "AppCatalog.properties", _tracker);
+ private final ComponentMessagesSourceImpl source = new ComponentMessagesSourceImpl(
+ simpleComponentResource, "AppCatalog.properties", tracker);
@Test
public void simple_component()
@@ -51,7 +51,7 @@
train_getComponentClassName(model, SIMPLE_COMPONENT_CLASS_NAME);
- train_getBaseResource(model, _simpleComponentResource);
+ train_getBaseResource(model, simpleComponentResource);
train_getParentModel(model, null);
@@ -59,20 +59,20 @@
forceCacheClear();
- Messages messages = _source.getMessages(model, Locale.ENGLISH);
+ Messages messages = source.getMessages(model, Locale.ENGLISH);
assertEquals(messages.get("color"), "color");
assertEquals(messages.get("framework"), "Tapestry");
// Check normal caching
- assertSame(_source.getMessages(model, Locale.ENGLISH), messages);
+ assertSame(source.getMessages(model, Locale.ENGLISH), messages);
// Now, force a cache clear and retry.
forceCacheClear();
- Messages messages2 = _source.getMessages(model, Locale.ENGLISH);
+ Messages messages2 = source.getMessages(model, Locale.ENGLISH);
// Check that a new Messages was created
@@ -86,8 +86,8 @@
private void forceCacheClear()
{
- _tracker.forceChange();
- _source.checkForUpdates();
+ tracker.forceChange();
+ source.checkForUpdates();
}
@Test
@@ -97,7 +97,7 @@
train_getComponentClassName(model, SIMPLE_COMPONENT_CLASS_NAME);
- train_getBaseResource(model, _simpleComponentResource);
+ train_getBaseResource(model, simpleComponentResource);
train_getParentModel(model, null);
@@ -105,7 +105,7 @@
forceCacheClear();
- Messages messages = _source.getMessages(model, Locale.UK);
+ Messages messages = source.getMessages(model, Locale.UK);
assertEquals(messages.get("color"), "colour");
assertEquals(messages.get("framework"), "Tapestry");
@@ -120,7 +120,7 @@
train_getComponentClassName(model, SIMPLE_COMPONENT_CLASS_NAME);
- train_getBaseResource(model, _simpleComponentResource);
+ train_getBaseResource(model, simpleComponentResource);
train_getParentModel(model, null);
@@ -128,7 +128,7 @@
forceCacheClear();
- Messages messages = _source.getMessages(model, Locale.UK);
+ Messages messages = source.getMessages(model, Locale.UK);
assertEquals(messages.get("COlor"), "colour");
assertEquals(messages.get("Framework"), "Tapestry");
@@ -153,7 +153,7 @@
train_getComponentClassName(parent, SIMPLE_COMPONENT_CLASS_NAME);
- train_getBaseResource(parent, _simpleComponentResource);
+ train_getBaseResource(parent, simpleComponentResource);
train_getParentModel(parent, null);
@@ -161,7 +161,7 @@
forceCacheClear();
- Messages messages = _source.getMessages(model, Locale.ENGLISH);
+ Messages messages = source.getMessages(model, Locale.ENGLISH);
assertEquals(messages.get("color"), "color");
assertEquals(messages.get("framework"), "Tapestry");
@@ -170,7 +170,7 @@
assertEquals(messages.get("app-catalog-source"), "AppCatalog");
assertEquals(messages.get("app-catalog-overridden"), "Overridden by Component");
- messages = _source.getMessages(model, Locale.UK);
+ messages = source.getMessages(model, Locale.UK);
assertEquals(messages.get("color"), "colour");
assertEquals(messages.get("framework"), "Tapestry");
@@ -197,7 +197,7 @@
train_getComponentClassName(parent, SIMPLE_COMPONENT_CLASS_NAME);
- train_getBaseResource(parent, _simpleComponentResource);
+ train_getBaseResource(parent, simpleComponentResource);
train_getParentModel(parent, null);
@@ -205,7 +205,7 @@
forceCacheClear();
- ComponentMessagesSource source = new ComponentMessagesSourceImpl(_simpleComponentResource,
+ ComponentMessagesSource source = new ComponentMessagesSourceImpl(simpleComponentResource,
"NoSuchAppCatalog.properties");
Messages messages = source.getMessages(model, Locale.ENGLISH);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImplTest.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImplTest.java Sun May 11 10:00:04 2008
@@ -36,11 +36,11 @@
static public final String PATH = "org/apache/tapestry/internal/pageload";
- private final ClassLoader _loader = Thread.currentThread().getContextClassLoader();
+ private final ClassLoader loader = Thread.currentThread().getContextClassLoader();
/**
- * Creates a new class loader, whose parent is the thread's context class loader, but adds a
- * single classpath root from the filesystem.
+ * Creates a new class loader, whose parent is the thread's context class loader, but adds a single classpath root
+ * from the filesystem.
*
* @see #createClasspathRoot()
*/
@@ -52,7 +52,7 @@
URL url = new URL(urlPath + "/");
return new URLClassLoader(new URL[]
- {url}, _loader);
+ { url }, loader);
}
/**
@@ -308,6 +308,6 @@
private Resource newResource(String name)
{
- return new ClasspathResource(_loader, PATH + "/" + name);
+ return new ClasspathResource(loader, PATH + "/" + name);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/CompositeBean.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/CompositeBean.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/CompositeBean.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/CompositeBean.java Sun May 11 10:00:04 2008
@@ -16,15 +16,15 @@
public class CompositeBean
{
- private SimpleBean _simple = new SimpleBean();
+ private SimpleBean simple = new SimpleBean();
public SimpleBean getSimple()
{
- return _simple;
+ return simple;
}
public void setSimple(SimpleBean simple)
{
- _simple = simple;
+ this.simple = simple;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/EnumBean.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/EnumBean.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/EnumBean.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/EnumBean.java Sun May 11 10:00:04 2008
@@ -18,16 +18,16 @@
public class EnumBean
{
- private TokenType _token;
+ private TokenType token;
public TokenType getToken()
{
- return _token;
+ return token;
}
public void setToken(TokenType token)
{
- _token = token;
+ this.token = token;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/FieldValidationSupportImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/FieldValidationSupportImplTest.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/FieldValidationSupportImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/FieldValidationSupportImplTest.java Sun May 11 10:00:04 2008
@@ -29,16 +29,16 @@
public class FieldValidationSupportImplTest extends InternalBaseTestCase
{
- private TypeCoercer _typeCoercer;
+ private TypeCoercer typeCoercer;
@BeforeClass
public void setup()
{
- _typeCoercer = getService(TypeCoercer.class);
+ typeCoercer = getService(TypeCoercer.class);
}
- @SuppressWarnings({"unchecked"})
+ @SuppressWarnings({ "unchecked" })
@Test
public void parse_client_via_event() throws ValidationException
{
@@ -51,7 +51,7 @@
IAnswer answer = new IAnswer()
{
- @SuppressWarnings({"unchecked"})
+ @SuppressWarnings({ "unchecked" })
public Object answer() throws Throwable
{
Object[] args = EasyMock.getCurrentArguments();
@@ -72,7 +72,7 @@
replay();
- FieldValidationSupport support = new FieldValidationSupportImpl(source, _typeCoercer);
+ FieldValidationSupport support = new FieldValidationSupportImpl(source, typeCoercer);
Object actual = support.parseClient(clientValue, resources, translator, nullFieldStrategy);
@@ -105,7 +105,7 @@
replay();
- FieldValidationSupport support = new FieldValidationSupportImpl(source, _typeCoercer);
+ FieldValidationSupport support = new FieldValidationSupportImpl(source, typeCoercer);
Object actual = support.parseClient(clientValue, resources, translator, nullFieldStrategy);
@@ -126,7 +126,7 @@
expect(nullFieldStrategy.replaceFromClient()).andReturn(value).atLeastOnce();
}
- @SuppressWarnings({"ThrowableInstanceNeverThrown"})
+ @SuppressWarnings({ "ThrowableInstanceNeverThrown" })
@Test
public void parse_client_event_handler_throws_validation_exception() throws Exception
{
@@ -146,7 +146,7 @@
replay();
- FieldValidationSupport support = new FieldValidationSupportImpl(source, _typeCoercer);
+ FieldValidationSupport support = new FieldValidationSupportImpl(source, typeCoercer);
try
{
@@ -163,7 +163,7 @@
verify();
}
- @SuppressWarnings({"ThrowableInstanceNeverThrown"})
+ @SuppressWarnings({ "ThrowableInstanceNeverThrown" })
@Test
public void parse_client_event_handler_fails_with_other_exception() throws Exception
{
@@ -183,7 +183,7 @@
replay();
- FieldValidationSupport support = new FieldValidationSupportImpl(source, _typeCoercer);
+ FieldValidationSupport support = new FieldValidationSupportImpl(source, typeCoercer);
try
{
@@ -222,7 +222,7 @@
replay();
- FieldValidationSupport support = new FieldValidationSupportImpl(source, _typeCoercer);
+ FieldValidationSupport support = new FieldValidationSupportImpl(source, typeCoercer);
Object actual = support.parseClient(clientValue, resources, translator, nullFieldStrategy);
@@ -231,7 +231,7 @@
verify();
}
- @SuppressWarnings({"unchecked"})
+ @SuppressWarnings({ "unchecked" })
@Test
public void to_client_via_translator()
{
@@ -246,14 +246,14 @@
String clientValue = "abracadabra";
EasyMock.expect(resources.triggerEvent(EasyMock.eq(FieldValidationSupportImpl.TO_CLIENT_EVENT),
- EasyMock.aryEq(new Object[]{value}),
+ EasyMock.aryEq(new Object[] { value }),
EasyMock.isA(ComponentEventCallback.class))).andReturn(false);
expect(translator.toClient(value)).andReturn(clientValue);
replay();
- FieldValidationSupport support = new FieldValidationSupportImpl(source, _typeCoercer);
+ FieldValidationSupport support = new FieldValidationSupportImpl(source, typeCoercer);
String actual = support.toClient(value, resources, translator, nullFieldStrategy);
@@ -262,7 +262,7 @@
verify();
}
- @SuppressWarnings({"unchecked"})
+ @SuppressWarnings({ "unchecked" })
@Test
public void to_client_via_event_handler() throws Exception
{
@@ -276,7 +276,7 @@
IAnswer answer = new IAnswer()
{
- @SuppressWarnings({"unchecked"})
+ @SuppressWarnings({ "unchecked" })
public Object answer() throws Throwable
{
Object[] args = EasyMock.getCurrentArguments();
@@ -287,7 +287,7 @@
};
EasyMock.expect(resources.triggerEvent(EasyMock.eq(FieldValidationSupportImpl.TO_CLIENT_EVENT),
- EasyMock.aryEq(new Object[]{value}),
+ EasyMock.aryEq(new Object[] { value }),
EasyMock.isA(ComponentEventCallback.class))).andAnswer(answer);
@@ -302,7 +302,7 @@
verify();
}
- @SuppressWarnings({"unchecked"})
+ @SuppressWarnings({ "unchecked" })
public void to_client_via_event_handler_returns_non_string() throws Exception
{
Object value = new Object();
@@ -312,7 +312,7 @@
IAnswer answer = new IAnswer()
{
- @SuppressWarnings({"unchecked"})
+ @SuppressWarnings({ "unchecked" })
public Object answer() throws Throwable
{
Object[] args = EasyMock.getCurrentArguments();
@@ -325,7 +325,7 @@
};
EasyMock.expect(resources.triggerEvent(EasyMock.eq(FieldValidationSupportImpl.TO_CLIENT_EVENT),
- EasyMock.aryEq(new Object[]{value}),
+ EasyMock.aryEq(new Object[] { value }),
EasyMock.isA(ComponentEventCallback.class))).andAnswer(answer);
@@ -348,7 +348,7 @@
verify();
}
- @SuppressWarnings({"unchecked"})
+ @SuppressWarnings({ "unchecked" })
@Test
public void event_triggered_after_delegate_invoked() throws Exception
{
@@ -365,19 +365,19 @@
ComponentEventCallback handler = null;
expect(resources.triggerEvent(EasyMock.eq(FieldValidationSupportImpl.VALIDATE_EVENT),
- EasyMock.aryEq(new Object[]{value}), EasyMock.eq(handler))).andReturn(true);
+ EasyMock.aryEq(new Object[] { value }), EasyMock.eq(handler))).andReturn(true);
replay();
- FieldValidationSupport support = new FieldValidationSupportImpl(source, _typeCoercer);
+ FieldValidationSupport support = new FieldValidationSupportImpl(source, typeCoercer);
support.validate(value, resources, fv);
verify();
}
- @SuppressWarnings({"unchecked", "ThrowableInstanceNeverThrown"})
+ @SuppressWarnings({ "unchecked", "ThrowableInstanceNeverThrown" })
@Test
public void event_trigger_throws_validation_exception() throws Exception
{
@@ -395,12 +395,12 @@
fv.validate(value);
expect(resources.triggerEvent(EasyMock.eq(FieldValidationSupportImpl.VALIDATE_EVENT),
- EasyMock.aryEq(new Object[]{value}), EasyMock.eq(handler))).andThrow(re);
+ EasyMock.aryEq(new Object[] { value }), EasyMock.eq(handler))).andThrow(re);
replay();
- FieldValidationSupport support = new FieldValidationSupportImpl(source, _typeCoercer);
+ FieldValidationSupport support = new FieldValidationSupportImpl(source, typeCoercer);
try
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/GenericBean.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/GenericBean.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/GenericBean.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/GenericBean.java Sun May 11 10:00:04 2008
@@ -16,15 +16,15 @@
public class GenericBean<T>
{
- private T _value;
+ private T value;
public T getValue()
{
- return _value;
+ return value;
}
public void setValue(T value)
{
- _value = value;
+ this.value = value;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/InheritedBindingTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/InheritedBindingTest.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/InheritedBindingTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/InheritedBindingTest.java Sun May 11 10:00:04 2008
@@ -27,7 +27,7 @@
private static final String MESSAGE = "Exception in inner.";
- private static final Throwable _exception = new RuntimeException(MESSAGE);
+ private static final Throwable exception = new RuntimeException(MESSAGE);
@Test
public void to_string_and_location()
@@ -69,7 +69,7 @@
Binding inner = mockBinding();
Location l = mockLocation();
- expect(inner.get()).andThrow(_exception);
+ expect(inner.get()).andThrow(exception);
replay();
@@ -113,7 +113,7 @@
Location l = mockLocation();
String description = BINDING_DESCRIPTION;
- expect(inner.getBindingType()).andThrow(_exception);
+ expect(inner.getBindingType()).andThrow(exception);
replay();
@@ -136,7 +136,7 @@
{
assertEquals(ex.getMessage(), MESSAGE);
assertEquals(ex.getLocation(), l);
- assertSame(ex.getCause(), _exception);
+ assertSame(ex.getCause(), exception);
}
@Test
@@ -162,7 +162,7 @@
{
Binding inner = mockBinding();
Location l = mockLocation();
- expect(inner.isInvariant()).andThrow(_exception);
+ expect(inner.isInvariant()).andThrow(exception);
replay();
@@ -208,7 +208,7 @@
Object parameter = new Object();
inner.set(parameter);
- getMocksControl().andThrow(_exception);
+ getMocksControl().andThrow(exception);
replay();
@@ -251,7 +251,7 @@
Binding inner = mockBinding();
Location l = mockLocation();
- expect(inner.getAnnotation(Inject.class)).andThrow(_exception);
+ expect(inner.getAnnotation(Inject.class)).andThrow(exception);
replay();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/InternalClassTransformationImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/InternalClassTransformationImplTest.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/InternalClassTransformationImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/InternalClassTransformationImplTest.java Sun May 11 10:00:04 2008
@@ -61,26 +61,26 @@
{
private static final String STRING_CLASS_NAME = "java.lang.String";
- private PropertyAccess _access;
+ private PropertyAccess access;
- private final ClassLoader _contextClassLoader = currentThread().getContextClassLoader();
+ private final ClassLoader contextClassLoader = currentThread().getContextClassLoader();
- private ClassFactory _classFactory;
+ private ClassFactory classFactory;
- private Loader _loader;
+ private Loader loader;
- private ClassFactoryClassPool _classFactoryClassPool;
+ private ClassFactoryClassPool classFactoryClassPool;
@BeforeClass
public void setup_access()
{
- _access = getService("PropertyAccess", PropertyAccess.class);
+ access = getService("PropertyAccess", PropertyAccess.class);
}
@AfterClass
public void cleanup_access()
{
- _access = null;
+ access = null;
}
/**
@@ -92,27 +92,27 @@
{
// _classPool = new ClassPool();
- _classFactoryClassPool = new ClassFactoryClassPool(_contextClassLoader);
+ classFactoryClassPool = new ClassFactoryClassPool(contextClassLoader);
- _loader = new TestPackageAwareLoader(_contextClassLoader, _classFactoryClassPool);
+ loader = new TestPackageAwareLoader(contextClassLoader, classFactoryClassPool);
// Inside Maven Surefire, the system classpath is not sufficient to find all
// the necessary files.
- _classFactoryClassPool.appendClassPath(new LoaderClassPath(_loader));
+ classFactoryClassPool.appendClassPath(new LoaderClassPath(loader));
Logger logger = LoggerFactory.getLogger(InternalClassTransformationImplTest.class);
- _classFactory = new ClassFactoryImpl(_loader, _classFactoryClassPool, logger);
+ classFactory = new ClassFactoryImpl(loader, classFactoryClassPool, logger);
}
private CtClass findCtClass(Class targetClass) throws NotFoundException
{
- return _classFactoryClassPool.get(targetClass.getName());
+ return classFactoryClassPool.get(targetClass.getName());
}
private Class toClass(CtClass ctClass) throws Exception
{
- return _classFactoryClassPool.toClass(ctClass, _loader, null);
+ return classFactoryClassPool.toClass(ctClass, loader, null);
}
@Test
@@ -173,7 +173,7 @@
MutableComponentModel model = new MutableComponentModelImpl("unknown-class", logger, null, null);
- return new InternalClassTransformationImpl(_classFactory, ctClass, null, model, null);
+ return new InternalClassTransformationImpl(classFactory, ctClass, null, model, null);
}
@Test
@@ -483,7 +483,7 @@
replay();
- InternalClassTransformation ct = new InternalClassTransformationImpl(_classFactory, targetObjectCtClass, null,
+ InternalClassTransformation ct = new InternalClassTransformationImpl(classFactory, targetObjectCtClass, null,
model, null);
// Default behavior is to add an injected field for the InternalComponentResources object,
@@ -516,7 +516,7 @@
replay();
- InternalClassTransformation ct = new InternalClassTransformationImpl(_classFactory, targetObjectCtClass, null,
+ InternalClassTransformation ct = new InternalClassTransformationImpl(classFactory, targetObjectCtClass, null,
model, null);
String parentFieldName = ct.addInjectedField(String.class, "_value", value);
@@ -549,7 +549,7 @@
Object instance = instantiator.newInstance(resources);
- Object actual = _access.get(instance, "value");
+ Object actual = access.get(instance, "value");
assertSame(actual, value);
@@ -568,7 +568,7 @@
replay();
- InternalClassTransformation ct = new InternalClassTransformationImpl(_classFactory, targetObjectCtClass, null,
+ InternalClassTransformation ct = new InternalClassTransformationImpl(classFactory, targetObjectCtClass, null,
model, null);
ct.addImplementedInterface(FooInterface.class);
@@ -616,7 +616,7 @@
CtClass targetObjectCtClass = findCtClass(ReadOnlyBean.class);
- InternalClassTransformation ct = new InternalClassTransformationImpl(_classFactory, targetObjectCtClass, null,
+ InternalClassTransformation ct = new InternalClassTransformationImpl(classFactory, targetObjectCtClass, null,
model, null);
ct.makeReadOnly("_value");
@@ -627,7 +627,7 @@
try
{
- _access.set(target, "value", "anything");
+ access.set(target, "value", "anything");
unreachable();
}
catch (RuntimeException ex)
@@ -673,7 +673,7 @@
CtClass targetObjectCtClass = findCtClass(ReadOnlyBean.class);
- InternalClassTransformation ct = new InternalClassTransformationImpl(_classFactory, targetObjectCtClass, null,
+ InternalClassTransformation ct = new InternalClassTransformationImpl(classFactory, targetObjectCtClass, null,
model, null);
ct.extendConstructor("_value = \"from constructor\";");
@@ -682,7 +682,7 @@
Object target = instantiate(ReadOnlyBean.class, ct, resources);
- assertEquals(_access.get(target, "value"), "from constructor");
+ assertEquals(access.get(target, "value"), "from constructor");
verify();
}
@@ -699,7 +699,7 @@
CtClass targetObjectCtClass = findCtClass(ReadOnlyBean.class);
- InternalClassTransformation ct = new InternalClassTransformationImpl(_classFactory, targetObjectCtClass, null,
+ InternalClassTransformation ct = new InternalClassTransformationImpl(classFactory, targetObjectCtClass, null,
model, null);
ct.injectField("_value", "Tapestry");
@@ -708,11 +708,11 @@
Object target = instantiate(ReadOnlyBean.class, ct, resources);
- assertEquals(_access.get(target, "value"), "Tapestry");
+ assertEquals(access.get(target, "value"), "Tapestry");
try
{
- _access.set(target, "value", "anything");
+ access.set(target, "value", "anything");
unreachable();
}
catch (RuntimeException ex)
@@ -742,7 +742,7 @@
CtClass targetObjectCtClass = findCtClass(FieldAccessBean.class);
- InternalClassTransformation ct = new InternalClassTransformationImpl(_classFactory, targetObjectCtClass, null,
+ InternalClassTransformation ct = new InternalClassTransformationImpl(classFactory, targetObjectCtClass, null,
model, null);
replaceAccessToField(ct, "foo");
@@ -768,7 +768,7 @@
try
{
- _access.get(target, propertyName);
+ access.get(target, propertyName);
unreachable();
}
catch (RuntimeException ex)
@@ -779,7 +779,7 @@
try
{
- _access.set(target, propertyName, "new value");
+ access.set(target, propertyName, "new value");
unreachable();
}
catch (RuntimeException ex)
@@ -1038,7 +1038,7 @@
// 66 reflects the change to the field.
- assertEquals(_access.get(target, "targetValue"), 66);
+ assertEquals(access.get(target, "targetValue"), 66);
verify();
}
@@ -1090,7 +1090,7 @@
// 66 reflects the change to the field, +1 reflects the extension of the method.
- assertEquals(_access.get(target, "targetValue"), 67);
+ assertEquals(access.get(target, "targetValue"), 67);
verify();
}
@@ -1130,7 +1130,7 @@
CtClass targetObjectCtClass = findCtClass(FieldRemoval.class);
- InternalClassTransformation ct = new InternalClassTransformationImpl(_classFactory, targetObjectCtClass, null,
+ InternalClassTransformation ct = new InternalClassTransformationImpl(classFactory, targetObjectCtClass, null,
model, null);
ct.removeField("_fieldToRemove");
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/LinkFactoryImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/LinkFactoryImplTest.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/LinkFactoryImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/LinkFactoryImplTest.java Sun May 11 10:00:04 2008
@@ -38,18 +38,18 @@
private static final String PAGE_LOGICAL_NAME = "sub/MyPage";
- private ContextValueEncoder _contextValueEncoder;
+ private ContextValueEncoder contextValueEncoder;
@BeforeClass
public void setup()
{
- _contextValueEncoder = getObject(ContextValueEncoder.class, null);
+ contextValueEncoder = getObject(ContextValueEncoder.class, null);
}
@AfterClass
public void cleanup()
{
- _contextValueEncoder = null;
+ contextValueEncoder = null;
}
@Test
@@ -119,7 +119,7 @@
replay();
- LinkFactory factory = new LinkFactoryImpl(request, response, map, null, optimizer, null, _contextValueEncoder,
+ LinkFactory factory = new LinkFactoryImpl(request, response, map, null, optimizer, null, contextValueEncoder,
securityManager);
factory.addListener(listener);
@@ -171,7 +171,7 @@
replay();
LinkFactory factory = new LinkFactoryImpl(request, response, map, null, optimizer, null,
- _contextValueEncoder,
+ contextValueEncoder,
securityManager);
factory.addListener(listener);
@@ -220,7 +220,7 @@
replay();
- LinkFactory factory = new LinkFactoryImpl(request, response, map, null, optimizer, null, _contextValueEncoder,
+ LinkFactory factory = new LinkFactoryImpl(request, response, map, null, optimizer, null, contextValueEncoder,
securityManager);
factory.addListener(listener);
@@ -267,7 +267,7 @@
replay();
- LinkFactory factory = new LinkFactoryImpl(request, response, map, null, optimizer, null, _contextValueEncoder,
+ LinkFactory factory = new LinkFactoryImpl(request, response, map, null, optimizer, null, contextValueEncoder,
securityManager);
factory.addListener(listener);
@@ -317,7 +317,7 @@
replay();
- LinkFactory factory = new LinkFactoryImpl(request, response, map, cache, optimizer, null, _contextValueEncoder,
+ LinkFactory factory = new LinkFactoryImpl(request, response, map, cache, optimizer, null, contextValueEncoder,
securityManager);
factory.addListener(listener);
@@ -369,7 +369,7 @@
replay();
- LinkFactory factory = new LinkFactoryImpl(request, response, map, cache, optimizer, null, _contextValueEncoder,
+ LinkFactory factory = new LinkFactoryImpl(request, response, map, cache, optimizer, null, contextValueEncoder,
securityManager);
factory.addListener(listener);
@@ -421,7 +421,7 @@
replay();
- LinkFactory factory = new LinkFactoryImpl(request, response, map, cache, optimizer, null, _contextValueEncoder,
+ LinkFactory factory = new LinkFactoryImpl(request, response, map, cache, optimizer, null, contextValueEncoder,
securityManager);
factory.addListener(listener);
@@ -543,7 +543,7 @@
replay();
LinkFactory factory = new LinkFactoryImpl(request, response, map, cache, optimizer, queue,
- _contextValueEncoder, securityManager);
+ contextValueEncoder, securityManager);
factory.addListener(listener);
Link link = factory.createActionLink(page, null, "myaction", false, "1.2.3", "4.5.6");
@@ -596,7 +596,7 @@
replay();
LinkFactory factory = new LinkFactoryImpl(request, response, map, cache, optimizer, queue,
- _contextValueEncoder, securityManager);
+ contextValueEncoder, securityManager);
factory.addListener(listener);
Link link = factory.createActionLink(containingPage, null, "myaction", false);
@@ -651,7 +651,7 @@
replay();
LinkFactory factory = new LinkFactoryImpl(request, response, map, cache, optimizer, queue,
- _contextValueEncoder, securityManager);
+ contextValueEncoder, securityManager);
factory.addListener(listener);
Link link = factory.createActionLink(page, nestedId, eventName, false, context);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/LocalizationSetterImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/LocalizationSetterImplTest.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/LocalizationSetterImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/LocalizationSetterImplTest.java Sun May 11 10:00:04 2008
@@ -23,7 +23,7 @@
public class LocalizationSetterImplTest extends Assert
{
- private PersistentLocale _nullPersistentLocale = new PersistentLocale()
+ private PersistentLocale nullPersistentLocale = new PersistentLocale()
{
public boolean isSet()
{
@@ -42,7 +42,7 @@
};
- private PersistentLocale _frenchPersistentLocale = new PersistentLocale()
+ private PersistentLocale frenchPersistentLocale = new PersistentLocale()
{
public boolean isSet()
{
@@ -88,7 +88,7 @@
@Test
public void to_locale_is_cached()
{
- LocalizationSetterImpl filter = new LocalizationSetterImpl(_nullPersistentLocale, null,
+ LocalizationSetterImpl filter = new LocalizationSetterImpl(nullPersistentLocale, null,
"en");
Locale l1 = filter.toLocale("en");
@@ -111,7 +111,7 @@
@Test
public void to_locale()
{
- LocalizationSetterImpl filter = new LocalizationSetterImpl(_nullPersistentLocale, null,
+ LocalizationSetterImpl filter = new LocalizationSetterImpl(nullPersistentLocale, null,
"en");
checkLocale(filter.toLocale("en"), "en", "", "");
@@ -124,7 +124,7 @@
{
ThreadLocale threadLocale = new ThreadLocaleImpl();
threadLocale.setLocale(Locale.FRENCH);
- LocalizationSetter setter = new LocalizationSetterImpl(_nullPersistentLocale, threadLocale,
+ LocalizationSetter setter = new LocalizationSetterImpl(nullPersistentLocale, threadLocale,
"en,fr");
setter.setThreadLocale(Locale.CANADA_FRENCH);
assertEquals(threadLocale.getLocale(), Locale.FRENCH);
@@ -136,7 +136,7 @@
{
ThreadLocale threadLocale = new ThreadLocaleImpl();
threadLocale.setLocale(Locale.FRENCH);
- LocalizationSetter setter = new LocalizationSetterImpl(_nullPersistentLocale, threadLocale,
+ LocalizationSetter setter = new LocalizationSetterImpl(nullPersistentLocale, threadLocale,
"en,fr");
setter.setThreadLocale(Locale.JAPANESE);
assertEquals(threadLocale.getLocale(), Locale.ENGLISH);
@@ -146,7 +146,7 @@
public void use_persistent_locale()
{
ThreadLocale threadLocale = new ThreadLocaleImpl();
- LocalizationSetter setter = new LocalizationSetterImpl(_frenchPersistentLocale,
+ LocalizationSetter setter = new LocalizationSetterImpl(frenchPersistentLocale,
threadLocale, "en,fr");
setter.setThreadLocale(Locale.ENGLISH);
assertEquals(threadLocale.getLocale(), Locale.FRENCH);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/MetaDataLocatorImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/MetaDataLocatorImplTest.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/MetaDataLocatorImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/MetaDataLocatorImplTest.java Sun May 11 10:00:04 2008
@@ -29,12 +29,12 @@
public class MetaDataLocatorImplTest extends InternalBaseTestCase
{
- private TypeCoercer _typeCoercer;
+ private TypeCoercer typeCoercer;
@BeforeClass
public void setup()
{
- _typeCoercer = getService(TypeCoercer.class);
+ typeCoercer = getService(TypeCoercer.class);
}
@Test
@@ -57,7 +57,7 @@
Map<String, String> configuration = Collections.emptyMap();
- MetaDataLocator locator = new MetaDataLocatorImpl(symbolSource, _typeCoercer, configuration);
+ MetaDataLocator locator = new MetaDataLocatorImpl(symbolSource, typeCoercer, configuration);
assertSame(locator.findMeta(key, resources, String.class), value);
@@ -99,7 +99,7 @@
Map<String, String> configuration = Collections.emptyMap();
- MetaDataLocator locator = new MetaDataLocatorImpl(symbolSource, _typeCoercer, configuration);
+ MetaDataLocator locator = new MetaDataLocatorImpl(symbolSource, typeCoercer, configuration);
assertSame(locator.findMeta(key, resources, String.class), value);
@@ -132,7 +132,7 @@
Map<String, String> configuration = newMap();
configuration.put(key, value);
- MetaDataLocator locator = new MetaDataLocatorImpl(symbolSource, _typeCoercer, configuration);
+ MetaDataLocator locator = new MetaDataLocatorImpl(symbolSource, typeCoercer, configuration);
assertSame(locator.findMeta(key, resources, String.class), value);
@@ -174,7 +174,7 @@
Map<String, String> configuration = newMap();
configuration.put(key.toUpperCase(), value);
- MetaDataLocator locator = new MetaDataLocatorImpl(symbolSource, _typeCoercer, configuration);
+ MetaDataLocator locator = new MetaDataLocatorImpl(symbolSource, typeCoercer, configuration);
assertSame(locator.findMeta(key, resources, String.class), value);
@@ -217,7 +217,7 @@
configuration.put(key, "xxx");
configuration.put("foo:" + key, value);
- MetaDataLocator locator = new MetaDataLocatorImpl(symbolSource, _typeCoercer, configuration);
+ MetaDataLocator locator = new MetaDataLocatorImpl(symbolSource, typeCoercer, configuration);
assertSame(locator.findMeta(key, resources, String.class), value);
@@ -255,7 +255,7 @@
Map<String, String> configuration = Collections.emptyMap();
- MetaDataLocatorImpl locator = new MetaDataLocatorImpl(symbolSource, _typeCoercer, configuration);
+ MetaDataLocatorImpl locator = new MetaDataLocatorImpl(symbolSource, typeCoercer, configuration);
assertSame(locator.findMeta(key, resources, String.class), value);
@@ -302,7 +302,7 @@
Map<String, String> configuration = Collections.emptyMap();
- MetaDataLocator locator = new MetaDataLocatorImpl(symbolSource, _typeCoercer, configuration);
+ MetaDataLocator locator = new MetaDataLocatorImpl(symbolSource, typeCoercer, configuration);
assertEquals(locator.findMeta(key, resources, Integer.class), new Integer(99));
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/NonVisualBean.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/NonVisualBean.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/NonVisualBean.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/NonVisualBean.java Sun May 11 10:00:04 2008
@@ -18,28 +18,28 @@
public class NonVisualBean
{
- private int _id;
+ private int id;
- private String _name;
+ private String name;
@NonVisual
public int getId()
{
- return _id;
+ return id;
}
public String getName()
{
- return _name;
+ return name;
}
public void setId(int id)
{
- _id = id;
+ this.id = id;
}
public void setName(String name)
{
- _name = name;
+ this.name = name;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageElementFactoryImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageElementFactoryImplTest.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageElementFactoryImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageElementFactoryImplTest.java Sun May 11 10:00:04 2008
@@ -32,15 +32,14 @@
public class PageElementFactoryImplTest extends InternalBaseTestCase
{
- private static MarkupModel _xmlModel = new XMLMarkupModel();
-
+ private static MarkupModel xmlModel = new XMLMarkupModel();
@Test
public void attribute()
{
ComponentInstantiatorSource source = mockComponentInstantiatorSource();
ComponentClassResolver resolver = mockComponentClassResolver();
- MarkupWriter writer = new MarkupWriterImpl(_xmlModel);
+ MarkupWriter writer = new MarkupWriterImpl(xmlModel);
Location l = mockLocation();
RenderQueue queue = mockRenderQueue();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PagePoolImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PagePoolImplTest.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PagePoolImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PagePoolImplTest.java Sun May 11 10:00:04 2008
@@ -32,7 +32,7 @@
// This will change once we start supporting application localization.
- private final Locale _locale = Locale.getDefault();
+ private final Locale locale = Locale.getDefault();
@Test
public void checkout_when_page_list_is_null()
@@ -45,9 +45,9 @@
train_canonicalizePageName(resolver, INPUT_PAGE_NAME, LOGICAL_PAGE_NAME);
- train_getLocale(tl, _locale);
+ train_getLocale(tl, locale);
- train_loadPage(loader, LOGICAL_PAGE_NAME, _locale, page);
+ train_loadPage(loader, LOGICAL_PAGE_NAME, locale, page);
replay();
@@ -70,9 +70,9 @@
train_canonicalizePageName(resolver, INPUT_PAGE_NAME, LOGICAL_PAGE_NAME);
- train_getLocale(tl, _locale);
+ train_getLocale(tl, locale);
- train_loadPage(loader, LOGICAL_PAGE_NAME, _locale, page1);
+ train_loadPage(loader, LOGICAL_PAGE_NAME, locale, page1);
replay();
@@ -84,7 +84,7 @@
train_detached(page1, false);
train_getLogicalName(page1, LOGICAL_PAGE_NAME);
- train_getLocale(page1, _locale);
+ train_getLocale(page1, locale);
replay();
@@ -93,12 +93,12 @@
verify();
train_canonicalizePageName(resolver, INPUT_PAGE_NAME, LOGICAL_PAGE_NAME);
- train_getLocale(tl, _locale);
+ train_getLocale(tl, locale);
train_canonicalizePageName(resolver, INPUT_PAGE_NAME, LOGICAL_PAGE_NAME);
- train_getLocale(tl, _locale);
+ train_getLocale(tl, locale);
- train_loadPage(loader, LOGICAL_PAGE_NAME, _locale, page2);
+ train_loadPage(loader, LOGICAL_PAGE_NAME, locale, page2);
replay();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageRenderDispatcherTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageRenderDispatcherTest.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageRenderDispatcherTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageRenderDispatcherTest.java Sun May 11 10:00:04 2008
@@ -30,12 +30,12 @@
public class PageRenderDispatcherTest extends InternalBaseTestCase
{
- private ContextValueEncoder _contextValueEncoder;
+ private ContextValueEncoder contextValueEncoder;
@BeforeClass
public void setup()
{
- _contextValueEncoder = getService(ContextValueEncoder.class);
+ contextValueEncoder = getService(ContextValueEncoder.class);
}
@Test
@@ -115,7 +115,7 @@
PageRenderRequestHandler handler = new PageRenderRequestHandlerImpl(cache, processor, renderer);
- Dispatcher d = new PageRenderDispatcher(resolver, handler, _contextValueEncoder);
+ Dispatcher d = new PageRenderDispatcher(resolver, handler, contextValueEncoder);
assertTrue(d.dispatch(request, response));
@@ -212,7 +212,7 @@
PageRenderRequestHandler handler = new PageRenderRequestHandlerImpl(cache, processor, renderer);
- Dispatcher d = new PageRenderDispatcher(resolver, handler, _contextValueEncoder);
+ Dispatcher d = new PageRenderDispatcher(resolver, handler, contextValueEncoder);
assertTrue(d.dispatch(request, response));
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ParserExperiment.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ParserExperiment.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ParserExperiment.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ParserExperiment.java Sun May 11 10:00:04 2008
@@ -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.internal.services;
import org.xml.sax.Attributes;
@@ -30,6 +30,8 @@
*/
public class ParserExperiment extends DefaultHandler
{
+ private Locator locator;
+
public static void main(String[] args) throws Exception
{
new ParserExperiment().parse("basic.tml");
@@ -69,9 +71,9 @@
buffer.append(String.format("%-25s:", methodName));
- if (_locator != null)
+ if (locator != null)
{
- buffer.append(String.format(" [Line %d, column %d]", _locator.getLineNumber(), _locator
+ buffer.append(String.format(" [Line %d, column %d]", locator.getLineNumber(), locator
.getColumnNumber()));
}
@@ -129,12 +131,10 @@
log("pi", "target=" + target, "data=" + data);
}
- private Locator _locator;
-
@Override
public void setDocumentLocator(Locator locator)
{
- _locator = locator;
+ this.locator = locator;
log("setDocumentLocator", "publicId=" + locator.getPublicId(), "systemId=" + locator.getSystemId());
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PropertyConduitSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PropertyConduitSourceImplTest.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PropertyConduitSourceImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PropertyConduitSourceImplTest.java Sun May 11 10:00:04 2008
@@ -32,25 +32,25 @@
*/
public class PropertyConduitSourceImplTest extends InternalBaseTestCase
{
- private PropertyConduitSource _source;
+ private PropertyConduitSource source;
@BeforeClass
public void setup()
{
- _source = getObject(PropertyConduitSource.class, null);
+ source = getObject(PropertyConduitSource.class, null);
}
@AfterClass
public void cleanup()
{
- _source = null;
+ source = null;
}
@Test
public void question_dot_operator_for_object_type()
{
- PropertyConduit normal = _source.create(CompositeBean.class, "simple.firstName");
- PropertyConduit smart = _source.create(CompositeBean.class, "simple?.firstName");
+ PropertyConduit normal = source.create(CompositeBean.class, "simple.firstName");
+ PropertyConduit smart = source.create(CompositeBean.class, "simple?.firstName");
CompositeBean bean = new CompositeBean();
bean.setSimple(null);
@@ -85,7 +85,7 @@
@Test
public void method_names_are_matched_caselessly()
{
- PropertyConduit conduit = _source.create(CompositeBean.class, "GETSIMPLE().firstName");
+ PropertyConduit conduit = source.create(CompositeBean.class, "GETSIMPLE().firstName");
CompositeBean bean = new CompositeBean();
SimpleBean inner = new SimpleBean();
@@ -121,7 +121,7 @@
simple.setFirstName("Howard");
- PropertyConduit conduit = _source.create(proxyClass, "firstName");
+ PropertyConduit conduit = source.create(proxyClass, "firstName");
assertEquals(conduit.get(simple), "Howard");
}
@@ -135,7 +135,7 @@
StringHolderBean bean = new StringHolderBean();
bean.setValue(stringHolder);
- PropertyConduit conduit = _source.create(StringHolderBean.class, "value.get()");
+ PropertyConduit conduit = source.create(StringHolderBean.class, "value.get()");
assertSame(conduit.get(bean), string);
@@ -145,7 +145,7 @@
@Test
public void null_root_object()
{
- PropertyConduit conduit = _source.create(StringHolderBean.class, "value.get()");
+ PropertyConduit conduit = source.create(StringHolderBean.class, "value.get()");
try
{
@@ -161,7 +161,7 @@
@Test
public void null_property_in_chain()
{
- PropertyConduit conduit = _source.create(CompositeBean.class, "simple.lastName");
+ PropertyConduit conduit = source.create(CompositeBean.class, "simple.lastName");
CompositeBean bean = new CompositeBean();
bean.setSimple(null);
@@ -181,7 +181,7 @@
@Test
public void last_term_may_be_null()
{
- PropertyConduit conduit = _source.create(CompositeBean.class, "simple.firstName");
+ PropertyConduit conduit = source.create(CompositeBean.class, "simple.firstName");
CompositeBean bean = new CompositeBean();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/SimpleASO.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/SimpleASO.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/SimpleASO.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/SimpleASO.java Sun May 11 10:00:04 2008
@@ -16,16 +16,16 @@
public class SimpleASO
{
- private String _value;
+ private String value;
public String getValue()
{
- return _value;
+ return value;
}
public void setValue(String value)
{
- _value = value;
+ this.value = value;
}
public String getReadOnly()
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/SimpleBean.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/SimpleBean.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/SimpleBean.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/SimpleBean.java Sun May 11 10:00:04 2008
@@ -18,41 +18,41 @@
public class SimpleBean
{
- private String _firstName;
+ private String firstName;
- private String _lastName;
+ private String lastName;
- private int _age;
+ private int age;
public String getFirstName()
{
- return _firstName;
+ return firstName;
}
public String getLastName()
{
- return _lastName;
+ return lastName;
}
@Width(2)
public int getAge()
{
- return _age;
+ return age;
}
public void setAge(int age)
{
- _age = age;
+ this.age = age;
}
public void setFirstName(String firstName)
{
- _firstName = firstName;
+ this.firstName = firstName;
}
public void setLastName(String lastName)
{
- _lastName = lastName;
+ this.lastName = lastName;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/StoogeBean.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/StoogeBean.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/StoogeBean.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/StoogeBean.java Sun May 11 10:00:04 2008
@@ -19,48 +19,48 @@
public class StoogeBean
{
- private int _moe, _larry, _curly, _shemp;
+ private int moe, larry, curly, shemp;
public int getMoe()
{
- return _moe;
+ return moe;
}
@OrderAfter("shemp")
public int getCurly()
{
- return _curly;
+ return curly;
}
@OrderBefore("moe")
public int getLarry()
{
- return _larry;
+ return larry;
}
public int getShemp()
{
- return _shemp;
+ return shemp;
}
public void setCurly(int curly)
{
- _curly = curly;
+ this.curly = curly;
}
public void setLarry(int larry)
{
- _larry = larry;
+ this.larry = larry;
}
public void setMoe(int moe)
{
- _moe = moe;
+ this.moe = moe;
}
public void setShemp(int shemp)
{
- _shemp = shemp;
+ this.shemp = shemp;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/StringArrayBean.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/StringArrayBean.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/StringArrayBean.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/StringArrayBean.java Sun May 11 10:00:04 2008
@@ -16,15 +16,15 @@
public class StringArrayBean
{
- private String[] _array;
+ private String[] array;
public String[] getArray()
{
- return _array;
+ return array;
}
public void setArray(String[] array)
{
- _array = array;
+ this.array = array;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/TranslatorSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/TranslatorSourceImplTest.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/TranslatorSourceImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/TranslatorSourceImplTest.java Sun May 11 10:00:04 2008
@@ -30,14 +30,15 @@
public class TranslatorSourceImplTest extends InternalBaseTestCase
{
- private TranslatorSource _source;
- private ValidationMessagesSource _messagesSource;
+ private TranslatorSource source;
+
+ private ValidationMessagesSource messagesSource;
@BeforeClass
public void setup()
{
- _source = getService(TranslatorSource.class);
- _messagesSource = getService(ValidationMessagesSource.class);
+ source = getService(TranslatorSource.class);
+ messagesSource = getService(ValidationMessagesSource.class);
}
@@ -100,19 +101,19 @@
@DataProvider(name = "to_client_data")
public Object[][] to_client_data()
{
- return new Object[][]{
+ return new Object[][] {
- {Byte.class, (byte) 65, "65"},
+ { Byte.class, (byte) 65, "65" },
- {Integer.class, 997, "997"},
+ { Integer.class, 997, "997" },
- {Long.class, 12345l, "12345"},
+ { Long.class, 12345l, "12345" },
- {Double.class, 123.45d, "123.45"},
+ { Double.class, 123.45d, "123.45" },
- {String.class, "abcd", "abcd"},
+ { String.class, "abcd", "abcd" },
- {Float.class, (float) -22.7, "-22.7"}
+ { Float.class, (float) -22.7, "-22.7" }
};
}
@@ -120,7 +121,7 @@
@Test(dataProvider = "to_client_data")
public void to_client(Class type, Object value, String expected)
{
- Translator t = _source.getByType(type);
+ Translator t = source.getByType(type);
String actual = t.toClient(value);
@@ -130,19 +131,19 @@
@DataProvider(name = "parse_client_success_data")
public Object[][] parse_client_success_data()
{
- return new Object[][]{
+ return new Object[][] {
- {Byte.class, " 23 ", (byte) 23},
+ { Byte.class, " 23 ", (byte) 23 },
- {Integer.class, " 123 ", 123},
+ { Integer.class, " 123 ", 123 },
- {Long.class, " -1234567 ", -1234567l},
+ { Long.class, " -1234567 ", -1234567l },
- {Double.class, " 3.14 ", 3.14d},
+ { Double.class, " 3.14 ", 3.14d },
- {String.class, " abcdef ", " abcdef "},
+ { String.class, " abcdef ", " abcdef " },
- {Float.class, " 28.95 ", (float) 28.95},
+ { Float.class, " 28.95 ", (float) 28.95 },
};
}
@@ -150,9 +151,9 @@
@Test(dataProvider = "parse_client_success_data")
public void parse_client(Class type, String input, Object expected) throws Exception
{
- Translator t = _source.getByType(type);
+ Translator t = source.getByType(type);
- Object actual = t.parseClient(input, _messagesSource.getValidationMessages(Locale.ENGLISH));
+ Object actual = t.parseClient(input, messagesSource.getValidationMessages(Locale.ENGLISH));
assertEquals(actual, expected);
}
@@ -160,17 +161,17 @@
@DataProvider(name = "parse_client_failure_data")
public Object[][] parse_client_failure_data()
{
- return new Object[][]{
+ return new Object[][] {
- {Byte.class, "fred", "The input value 'fred' is not parseable as an integer value."},
+ { Byte.class, "fred", "The input value 'fred' is not parseable as an integer value." },
- {Integer.class, "fred", "The input value 'fred' is not parseable as an integer value."},
+ { Integer.class, "fred", "The input value 'fred' is not parseable as an integer value." },
- {Long.class, "fred", "The input value 'fred' is not parseable as an integer value."},
+ { Long.class, "fred", "The input value 'fred' is not parseable as an integer value." },
- {Double.class, "fred", "The input value 'fred' is not parseable as a numeric value."},
+ { Double.class, "fred", "The input value 'fred' is not parseable as a numeric value." },
- {Float.class, "fred", "The input value 'fred' is not parseable as a numeric value."}
+ { Float.class, "fred", "The input value 'fred' is not parseable as a numeric value." }
};
}
@@ -179,11 +180,11 @@
public void parse_client_failure(Class type, String input, String expectedMessage)
{
- Translator t = _source.getByType(type);
+ Translator t = source.getByType(type);
try
{
- t.parseClient(input, _messagesSource.getValidationMessages(Locale.ENGLISH));
+ t.parseClient(input, messagesSource.getValidationMessages(Locale.ENGLISH));
unreachable();
}
catch (ValidationException ex)