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 [5/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/ValidationMessagesSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ValidationMessagesSourceImplTest.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ValidationMessagesSourceImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ValidationMessagesSourceImplTest.java Sun May 11 10:00:04 2008
@@ -28,13 +28,13 @@
public class ValidationMessagesSourceImplTest extends Assert
{
- private ValidationMessagesSource _source;
+ private ValidationMessagesSource source;
@BeforeClass
public void setup()
{
Resource rootResource = new ClasspathResource("/");
- _source = new ValidationMessagesSourceImpl(Arrays.asList(
+ source = new ValidationMessagesSourceImpl(Arrays.asList(
"org/apache/tapestry/internal/ValidationMessages",
"org/apache/tapestry/internal/ValidationTestMessages"), rootResource);
}
@@ -42,7 +42,7 @@
@Test
public void builtin_message()
{
- Messages messages = _source.getValidationMessages(Locale.ENGLISH);
+ Messages messages = source.getValidationMessages(Locale.ENGLISH);
assertEquals(
messages.format("required", "My Field"),
@@ -52,7 +52,7 @@
@Test
public void contributed_message()
{
- Messages messages = _source.getValidationMessages(Locale.ENGLISH);
+ Messages messages = source.getValidationMessages(Locale.ENGLISH);
assertEquals(
messages.get("contributed"),
@@ -62,7 +62,7 @@
@Test
public void localization_of_message()
{
- Messages messages = _source.getValidationMessages(Locale.FRENCH);
+ Messages messages = source.getValidationMessages(Locale.FRENCH);
assertEquals(messages.get("contributed"), "Zees eez Cohntributahd.");
}
@@ -70,7 +70,7 @@
@Test
public void contains()
{
- Messages messages = _source.getValidationMessages(Locale.ENGLISH);
+ Messages messages = source.getValidationMessages(Locale.ENGLISH);
assertEquals(messages.contains("required"), true);
assertEquals(messages.contains("contributed"), true);
@@ -80,7 +80,7 @@
@Test
public void message_formatter()
{
- Messages messages = _source.getValidationMessages(Locale.ENGLISH);
+ Messages messages = source.getValidationMessages(Locale.ENGLISH);
MessageFormatter formatter = messages.getFormatter("required");
@@ -90,11 +90,11 @@
@Test
public void messages_instances_are_cached()
{
- Messages english = _source.getValidationMessages(Locale.ENGLISH);
- Messages french = _source.getValidationMessages(Locale.FRENCH);
+ Messages english = source.getValidationMessages(Locale.ENGLISH);
+ Messages french = source.getValidationMessages(Locale.FRENCH);
- assertSame(_source.getValidationMessages(Locale.ENGLISH), english);
- assertSame(_source.getValidationMessages(Locale.FRENCH), french);
+ assertSame(source.getValidationMessages(Locale.ENGLISH), english);
+ assertSame(source.getValidationMessages(Locale.FRENCH), french);
assertNotSame(french, english);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/VisibilityBean.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/VisibilityBean.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/VisibilityBean.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/VisibilityBean.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.apache.tapestry.annotations.Retain;
@@ -36,16 +36,16 @@
public String _$myPublic;
@Retain
- private long _$myLong;
+ private long $myLong;
public long getMyLong()
{
- return _$myLong;
+ return $myLong;
}
public void setMyLong(long myLong)
{
- _$myLong = myLong;
+ $myLong = myLong;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/structure/PageImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/structure/PageImplTest.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/structure/PageImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/structure/PageImplTest.java Sun May 11 10:00:04 2008
@@ -25,7 +25,7 @@
public class PageImplTest extends InternalBaseTestCase
{
- private final Locale _locale = Locale.ENGLISH;
+ private final Locale locale = Locale.ENGLISH;
private static final String LOGICAL_PAGE_NAME = "MyPage";
@@ -36,13 +36,13 @@
replay();
- Page page = new PageImpl(LOGICAL_PAGE_NAME, _locale, null, null);
+ Page page = new PageImpl(LOGICAL_PAGE_NAME, locale, null, null);
assertNull(page.getRootElement());
page.setRootElement(root);
- assertSame(page.getLocale(), _locale);
+ assertSame(page.getLocale(), locale);
assertSame(page.getRootElement(), root);
assertSame(page.getLogicalName(), LOGICAL_PAGE_NAME);
@@ -60,7 +60,7 @@
replay();
- Page page = new PageImpl(null, _locale, null, null);
+ Page page = new PageImpl(null, locale, null, null);
page.addLifecycleListener(listener1);
page.addLifecycleListener(listener2);
@@ -82,7 +82,7 @@
replay();
- Page page = new PageImpl(null, _locale, null, null);
+ Page page = new PageImpl(null, locale, null, null);
page.addLifecycleListener(listener);
@@ -116,7 +116,7 @@
replay();
- Page page = new PageImpl(null, _locale, null, null);
+ Page page = new PageImpl(null, locale, null, null);
page.setRootElement(element);
page.addLifecycleListener(listener1);
@@ -145,7 +145,7 @@
replay();
- Page page = new PageImpl(null, _locale, null, null);
+ Page page = new PageImpl(null, locale, null, null);
page.addLifecycleListener(listener1);
page.addLifecycleListener(listener2);
@@ -171,7 +171,7 @@
replay();
- Page page = new PageImpl(LOGICAL_PAGE_NAME, _locale, null, null);
+ Page page = new PageImpl(LOGICAL_PAGE_NAME, locale, null, null);
page.addLifecycleListener(listener1);
page.addLifecycleListener(listener2);
@@ -188,7 +188,7 @@
replay();
- Page page = new PageImpl(LOGICAL_PAGE_NAME, _locale, null, null);
+ Page page = new PageImpl(LOGICAL_PAGE_NAME, locale, null, null);
page.setRootElement(root);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/test/InternalBaseTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/test/InternalBaseTestCase.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/test/InternalBaseTestCase.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/test/InternalBaseTestCase.java Sun May 11 10:00:04 2008
@@ -62,9 +62,9 @@
*/
public class InternalBaseTestCase extends TapestryTestCase implements Registry
{
- private static Registry _registry;
+ private static Registry registry;
- private Messages _validationMessages;
+ private Messages validationMessages;
@BeforeSuite
public final void setup_registry()
@@ -83,55 +83,55 @@
builder.add(module);
- _registry = builder.build();
+ registry = builder.build();
- // _registry.getService(Alias.class).setMode("servlet");
+ // registry.getService(Alias.class).setMode("servlet");
- _registry.performRegistryStartup();
+ registry.performRegistryStartup();
}
@AfterSuite
public final void shutdown_registry()
{
- _registry.shutdown();
+ registry.shutdown();
- _registry = null;
+ registry = null;
}
@AfterMethod
public final void cleanupThread()
{
- _registry.cleanupThread();
+ registry.cleanupThread();
}
public void performRegistryStartup()
{
- _registry.performRegistryStartup();
+ registry.performRegistryStartup();
}
public final <T> T getObject(Class<T> objectType, AnnotationProvider annotationProvider)
{
- return _registry.getObject(objectType, annotationProvider);
+ return registry.getObject(objectType, annotationProvider);
}
public final <T> T getService(Class<T> serviceInterface)
{
- return _registry.getService(serviceInterface);
+ return registry.getService(serviceInterface);
}
public final <T> T getService(String serviceId, Class<T> serviceInterface)
{
- return _registry.getService(serviceId, serviceInterface);
+ return registry.getService(serviceId, serviceInterface);
}
public final <T> T autobuild(Class<T> clazz)
{
- return _registry.autobuild(clazz);
+ return registry.autobuild(clazz);
}
public <T> T proxy(Class<T> interfaceClass, Class<? extends T> implementationClass)
{
- return _registry.proxy(interfaceClass, implementationClass);
+ return registry.proxy(interfaceClass, implementationClass);
}
public final void shutdown()
@@ -416,15 +416,15 @@
*/
protected final Messages validationMessages()
{
- if (_validationMessages == null)
+ if (validationMessages == null)
{
ResourceBundle bundle = ResourceBundle
.getBundle("org.apache.tapestry.internal.ValidationMessages");
- _validationMessages = new MessagesImpl(Locale.ENGLISH, bundle);
+ validationMessages = new MessagesImpl(Locale.ENGLISH, bundle);
}
- return _validationMessages;
+ return validationMessages;
}
protected final LinkFactoryListener mockLinkFactoryListener()
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/test/PageTesterSessionTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/test/PageTesterSessionTest.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/test/PageTesterSessionTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/test/PageTesterSessionTest.java Sun May 11 10:00:04 2008
@@ -1,17 +1,17 @@
-// Copyright 2006, 2007 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006, 2007 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry.internal.test;
import org.testng.Assert;
@@ -23,46 +23,46 @@
public class PageTesterSessionTest extends Assert
{
- private PageTesterSession _session;
+ private PageTesterSession session;
@BeforeMethod
public void before()
{
- _session = new PageTesterSession();
+ session = new PageTesterSession();
}
@Test
public void empty()
{
- assertEquals(_session.getAttributeNames(), Collections.EMPTY_LIST);
- assertNull(_session.getAttribute("x"));
+ assertEquals(session.getAttributeNames(), Collections.EMPTY_LIST);
+ assertNull(session.getAttribute("x"));
}
@Test
public void set_attributes()
{
- _session.setAttribute("b", 10);
- _session.setAttribute("a", 20);
- assertEquals(_session.getAttribute("a"), 20);
- assertEquals(_session.getAttribute("b"), 10);
+ session.setAttribute("b", 10);
+ session.setAttribute("a", 20);
+ assertEquals(session.getAttribute("a"), 20);
+ assertEquals(session.getAttribute("b"), 10);
}
@Test
public void remove_if_value_is_null()
{
- _session.setAttribute("b", 10);
- _session.setAttribute("a", 20);
- assertEquals(_session.getAttributeNames().size(), 2);
- _session.setAttribute("b", null);
- assertEquals(_session.getAttributeNames().size(), 1);
+ session.setAttribute("b", 10);
+ session.setAttribute("a", 20);
+ assertEquals(session.getAttributeNames().size(), 2);
+ session.setAttribute("b", null);
+ assertEquals(session.getAttributeNames().size(), 1);
}
@Test
public void names_sorted()
{
- _session.setAttribute("b", 10);
- _session.setAttribute("a", 20);
- _session.setAttribute("c", 50);
- assertEquals(_session.getAttributeNames(), Arrays.asList("a", "b", "c"));
+ session.setAttribute("b", 10);
+ session.setAttribute("a", 20);
+ session.setAttribute("c", 50);
+ assertEquals(session.getAttributeNames(), Arrays.asList("a", "b", "c"));
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/ApplicationStateWorkerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/ApplicationStateWorkerTest.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/ApplicationStateWorkerTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/ApplicationStateWorkerTest.java Sun May 11 10:00:04 2008
@@ -41,15 +41,15 @@
public class ApplicationStateWorkerTest extends InternalBaseTestCase
{
- private final ClassLoader _contextClassLoader = Thread.currentThread().getContextClassLoader();
+ private final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
- private PropertyAccess _access = new PropertyAccessImpl();
+ private PropertyAccess access = new PropertyAccessImpl();
- private ClassFactory _classFactory;
+ private ClassFactory classFactory;
- private Loader _loader;
+ private Loader loader;
- private ClassFactoryClassPool _classFactoryClassPool;
+ private ClassFactoryClassPool classFactoryClassPool;
/**
* We need a new ClassPool for each individual test, since many of the tests will end up modifying one or more
@@ -60,33 +60,33 @@
{
// _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);
}
@AfterClass
public void cleanup()
{
- _access = null;
+ access = null;
}
@Test
@@ -127,7 +127,7 @@
replay();
- InternalClassTransformation transformation = new InternalClassTransformationImpl(_classFactory, ctClass, null,
+ InternalClassTransformation transformation = new InternalClassTransformationImpl(classFactory, ctClass, null,
model, null);
new ApplicationStateWorker(manager, cache).transform(transformation, model);
@@ -145,7 +145,7 @@
replay();
- assertEquals(_access.get(component, "beanExists"), true);
+ assertEquals(access.get(component, "beanExists"), true);
verify();
@@ -157,7 +157,7 @@
replay();
- assertSame(_access.get(component, "bean"), aso);
+ assertSame(access.get(component, "bean"), aso);
verify();
@@ -169,7 +169,7 @@
replay();
- _access.set(component, "bean", aso2);
+ access.set(component, "bean", aso2);
verify();
}
@@ -194,7 +194,7 @@
replay();
- InternalClassTransformation transformation = new InternalClassTransformationImpl(_classFactory, ctClass, null,
+ InternalClassTransformation transformation = new InternalClassTransformationImpl(classFactory, ctClass, null,
model, null);
new ApplicationStateWorker(manager, cache).transform(transformation, model);
@@ -212,7 +212,7 @@
replay();
- assertNull(_access.get(component, "bean"));
+ assertNull(access.get(component, "bean"));
verify();
@@ -223,7 +223,7 @@
replay();
- assertSame(_access.get(component, "bean"), aso);
+ assertSame(access.get(component, "bean"), aso);
verify();
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/ParameterWorkerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/ParameterWorkerTest.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/ParameterWorkerTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/ParameterWorkerTest.java Sun May 11 10:00:04 2008
@@ -45,9 +45,9 @@
*/
public class ParameterWorkerTest extends InternalBaseTestCase
{
- private final ClassLoader _contextClassLoader = Thread.currentThread().getContextClassLoader();
+ private final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
- private PropertyAccess _access = new PropertyAccessImpl();
+ private PropertyAccess access = new PropertyAccessImpl();
/**
* Accessed by DefaultParameterBindingMethodComponent.
@@ -57,7 +57,7 @@
@AfterClass
public void cleanup()
{
- _access = null;
+ access = null;
_binding = null;
}
@@ -86,7 +86,7 @@
replay();
- assertSame(_access.get(component, "invariantObject"), value);
+ assertSame(access.get(component, "invariantObject"), value);
verify();
@@ -96,19 +96,19 @@
// Still cached ...
- assertSame(_access.get(component, "invariantObject"), value);
+ assertSame(access.get(component, "invariantObject"), value);
component.postRenderCleanup();
// Still cached ...
- assertSame(_access.get(component, "invariantObject"), value);
+ assertSame(access.get(component, "invariantObject"), value);
component.containingPageDidDetach();
// Still cached ...
- assertSame(_access.get(component, "invariantObject"), value);
+ assertSame(access.get(component, "invariantObject"), value);
verify();
}
@@ -130,7 +130,7 @@
replay();
- assertEquals(_access.get(component, "invariantPrimitive"), value);
+ assertEquals(access.get(component, "invariantPrimitive"), value);
verify();
@@ -140,13 +140,13 @@
// Still cached ...
- assertEquals(_access.get(component, "invariantPrimitive"), value);
+ assertEquals(access.get(component, "invariantPrimitive"), value);
component.postRenderCleanup();
// Still cached ...
- assertEquals(_access.get(component, "invariantPrimitive"), value);
+ assertEquals(access.get(component, "invariantPrimitive"), value);
verify();
}
@@ -170,7 +170,7 @@
replay();
- assertNull(_access.get(component, "object"));
+ assertNull(access.get(component, "object"));
verify();
@@ -178,7 +178,7 @@
replay();
- _access.set(component, "object", "new-default");
+ access.set(component, "object", "new-default");
verify();
@@ -186,7 +186,7 @@
replay();
- assertEquals(_access.get(component, "object"), "new-default");
+ assertEquals(access.get(component, "object"), "new-default");
verify();
@@ -216,12 +216,12 @@
replay();
- _access.set(component, "object", "new-value");
- assertEquals(_access.get(component, "object"), "new-value");
+ access.set(component, "object", "new-value");
+ assertEquals(access.get(component, "object"), "new-value");
component.postRenderCleanup();
- assertEquals(_access.get(component, "object"), "new-default");
+ assertEquals(access.get(component, "object"), "new-default");
verify();
}
@@ -240,7 +240,7 @@
replay();
- assertEquals(_access.get(component, "object"), "first");
+ assertEquals(access.get(component, "object"), "first");
verify();
@@ -253,7 +253,7 @@
replay();
- assertEquals(_access.get(component, "object"), "second");
+ assertEquals(access.get(component, "object"), "second");
verify();
@@ -266,11 +266,11 @@
replay();
- assertEquals(_access.get(component, "object"), "third");
+ assertEquals(access.get(component, "object"), "third");
// Does not cause readParameter() to be invoked:
- assertEquals(_access.get(component, "object"), "third");
+ assertEquals(access.get(component, "object"), "third");
verify();
@@ -283,7 +283,7 @@
component.postRenderCleanup();
- assertEquals(_access.get(component, "object"), "fourth");
+ assertEquals(access.get(component, "object"), "fourth");
verify();
}
@@ -307,8 +307,8 @@
replay();
- _access.set(component, "object", "first");
- assertEquals(_access.get(component, "object"), "second");
+ access.set(component, "object", "first");
+ assertEquals(access.get(component, "object"), "second");
verify();
@@ -321,8 +321,8 @@
replay();
- _access.set(component, "object", "third");
- assertEquals(_access.get(component, "object"), "third");
+ access.set(component, "object", "third");
+ assertEquals(access.get(component, "object"), "third");
verify();
@@ -337,7 +337,7 @@
component.postRenderCleanup();
- assertEquals(_access.get(component, "object"), "fourth");
+ assertEquals(access.get(component, "object"), "fourth");
verify();
}
@@ -362,8 +362,8 @@
replay();
- _access.set(component, "primitive", 321);
- assertEquals(_access.get(component, "primitive"), 123);
+ access.set(component, "primitive", 321);
+ assertEquals(access.get(component, "primitive"), 123);
verify();
@@ -376,8 +376,8 @@
replay();
- _access.set(component, "primitive", 567);
- assertEquals(_access.get(component, "primitive"), 567);
+ access.set(component, "primitive", 567);
+ assertEquals(access.get(component, "primitive"), 567);
verify();
@@ -392,7 +392,7 @@
component.postRenderCleanup();
- assertEquals(_access.get(component, "primitive"), 890);
+ assertEquals(access.get(component, "primitive"), 890);
verify();
}
@@ -417,8 +417,8 @@
replay();
- assertEquals(_access.get(component, "uncachedObject"), "first");
- assertEquals(_access.get(component, "uncachedObject"), "second");
+ assertEquals(access.get(component, "uncachedObject"), "first");
+ assertEquals(access.get(component, "uncachedObject"), "second");
verify();
}
@@ -449,8 +449,8 @@
replay();
- _access.set(component, "uncachedObject", "first");
- assertEquals(_access.get(component, "uncachedObject"), "second");
+ access.set(component, "uncachedObject", "first");
+ assertEquals(access.get(component, "uncachedObject"), "second");
verify();
}
@@ -495,7 +495,7 @@
replay();
- assertEquals(_access.get(component, "value"), boundValue);
+ assertEquals(access.get(component, "value"), boundValue);
verify();
}
@@ -539,7 +539,7 @@
stub_isDebugEnabled(logger, false);
replay();
- assertEquals(_access.get(component, "value"), boundValue);
+ assertEquals(access.get(component, "value"), boundValue);
verify();
}
@@ -590,9 +590,9 @@
String componentClassName, MutableComponentModel model,
BindingSource source, Runnable phaseTwoTraining) throws Exception
{
- ClassFactoryClassPool pool = new ClassFactoryClassPool(_contextClassLoader);
+ ClassFactoryClassPool pool = new ClassFactoryClassPool(contextClassLoader);
- Loader loader = new TestPackageAwareLoader(_contextClassLoader, pool);
+ Loader loader = new TestPackageAwareLoader(contextClassLoader, pool);
pool.appendClassPath(new LoaderClassPath(loader));
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/components/DefaultParameterBindingMethodComponent.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/components/DefaultParameterBindingMethodComponent.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/components/DefaultParameterBindingMethodComponent.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/components/DefaultParameterBindingMethodComponent.java Sun May 11 10:00:04 2008
@@ -21,11 +21,11 @@
public class DefaultParameterBindingMethodComponent
{
@Parameter
- private String _value;
+ private String value;
public String getValue()
{
- return _value;
+ return value;
}
Binding defaultValue()
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/components/DefaultParameterComponent.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/components/DefaultParameterComponent.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/components/DefaultParameterComponent.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/components/DefaultParameterComponent.java Sun May 11 10:00:04 2008
@@ -22,11 +22,11 @@
public class DefaultParameterComponent
{
@Parameter("literal:greeting")
- private String _value;
+ private String value;
public String getValue()
{
- return _value;
+ return value;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/components/ParameterComponent.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/components/ParameterComponent.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/components/ParameterComponent.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/components/ParameterComponent.java Sun May 11 10:00:04 2008
@@ -22,68 +22,68 @@
public class ParameterComponent
{
@Parameter
- private String _object;
+ private String object;
@Parameter(cache = false, name = "uncached", defaultPrefix = "literal")
- private String _uncachedObject;
+ private String uncachedObject;
@Parameter(required = true)
- private int _primitive;
+ private int primitive;
@Parameter
- private String _invariantObject;
+ private String invariantObject;
@Parameter
- private long _invariantPrimitive;
+ private long invariantPrimitive;
public String getObject()
{
- return _object;
+ return object;
}
public void setObject(String object)
{
- _object = object;
+ this.object = object;
}
public int getPrimitive()
{
- return _primitive;
+ return primitive;
}
public void setPrimitive(int primitive)
{
- _primitive = primitive;
+ this.primitive = primitive;
}
public String getUncachedObject()
{
- return _uncachedObject;
+ return uncachedObject;
}
public void setUncachedObject(String uncachedObject)
{
- _uncachedObject = uncachedObject;
+ this.uncachedObject = uncachedObject;
}
public String getInvariantObject()
{
- return _invariantObject;
+ return invariantObject;
}
public void setInvariantObject(String invariantObject)
{
- _invariantObject = invariantObject;
+ this.invariantObject = invariantObject;
}
public long getInvariantPrimitive()
{
- return _invariantPrimitive;
+ return invariantPrimitive;
}
public void setInvariantPrimitive(long invariantPrimitive)
{
- _invariantPrimitive = invariantPrimitive;
+ this.invariantPrimitive = invariantPrimitive;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/BasicComponent.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/BasicComponent.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/BasicComponent.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/BasicComponent.java Sun May 11 10:00:04 2008
@@ -21,28 +21,28 @@
*/
public class BasicComponent
{
- private String _value;
+ private String value;
@Retain
- private String _retainedValue;
+ private String retainedValue;
public final String getRetainedValue()
{
- return _retainedValue;
+ return retainedValue;
}
public final void setRetainedValue(String retainedValue)
{
- _retainedValue = retainedValue;
+ this.retainedValue = retainedValue;
}
public final String getValue()
{
- return _value;
+ return value;
}
public final void setValue(String value)
{
- _value = value;
+ this.value = value;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/BasicSubComponent.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/BasicSubComponent.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/BasicSubComponent.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/BasicSubComponent.java Sun May 11 10:00:04 2008
@@ -1,31 +1,31 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry.internal.transform.pages;
/** */
public class BasicSubComponent extends BasicComponent
{
- private int _intValue;
+ private int intValue;
public final int getIntValue()
{
- return _intValue;
+ return intValue;
}
public final void setIntValue(int intValue)
{
- _intValue = intValue;
+ this.intValue = intValue;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/MaybeStateHolder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/MaybeStateHolder.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/MaybeStateHolder.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/MaybeStateHolder.java Sun May 11 10:00:04 2008
@@ -20,11 +20,11 @@
public class MaybeStateHolder
{
@ApplicationState(create = false)
- private SimpleASO _bean;
+ private SimpleASO bean;
public SimpleASO getBean()
{
- return _bean;
+ return bean;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/StateHolder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/StateHolder.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/StateHolder.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/pages/StateHolder.java Sun May 11 10:00:04 2008
@@ -20,23 +20,23 @@
public class StateHolder
{
@ApplicationState
- private SimpleASO _bean;
+ private SimpleASO bean;
- private boolean _beanExists;
+ private boolean beanExists;
public SimpleASO getBean()
{
- return _bean;
+ return bean;
}
public void setBean(SimpleASO bean)
{
- _bean = bean;
+ this.bean = bean;
}
public boolean getBeanExists()
{
- return _beanExists;
+ return beanExists;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/services/SyncCostBench.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/services/SyncCostBench.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/services/SyncCostBench.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/services/SyncCostBench.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.services;
import org.apache.tapestry.ioc.internal.util.ConcurrentBarrier;
@@ -22,18 +22,16 @@
import java.util.concurrent.locks.ReentrantReadWriteLock;
/**
- * Tests single-thread synchronization overhead using different techniques. Note that we're fudging
- * things a bit by getting a read lock for a write operation .... it's just that I'm more concerned
- * about read locks (which will be very common) than about write locks (very rare). Another concern
- * is that hotspot is going to mess up our synchronization when it see we're not really doing
- * anything multi-threaded.
+ * Tests single-thread synchronization overhead using different techniques. Note that we're fudging things a bit by
+ * getting a read lock for a write operation .... it's just that I'm more concerned about read locks (which will be very
+ * common) than about write locks (very rare). Another concern is that hotspot is going to mess up our synchronization
+ * when it see we're not really doing anything multi-threaded.
* <p/>
- * The results show that using the {@link org.apache.tapestry.internal.annotations.Concurrent}
- * aspect (which used a {@link java.util.concurrent.locks.ReentrantReadWriteLock} under the covers)
- * is about 4x as expensive as just using the synchronized keyword. There are some anomolous results
- * ... for example, ReadWriteLockRunner is consistently slower than ReadWriteLockAspectRunner (one
- * would expect it to be the other way around ... must be something about how AspectJ weaves the
- * code ... and it's use of static methods in many cases).
+ * The results show that using the {@link org.apache.tapestry.internal.annotations.Concurrent} aspect (which used a
+ * {@link java.util.concurrent.locks.ReentrantReadWriteLock} under the covers) is about 4x as expensive as just using
+ * the synchronized keyword. There are some anomolous results ... for example, ReadWriteLockRunner is consistently
+ * slower than ReadWriteLockAspectRunner (one would expect it to be the other way around ... must be something about how
+ * AspectJ weaves the code ... and it's use of static methods in many cases).
* <p/>
* Well, the Concurrent aspect is gone, replaced with the {@link ConcurrentBarrier} utility.
*/
@@ -44,75 +42,75 @@
*/
static class Worker implements Runnable
{
- private long[] _series = {1, 1};
+ private long[] series = { 1, 1 };
public void run()
{
- long value = _series[0] + _series[1];
+ long value = series[0] + series[1];
// Now shift the values down to prepare for the next iteration.
- _series[0] = _series[1];
- _series[1] = value;
+ series[0] = series[1];
+ series[1] = value;
}
}
static class SimpleRunner implements Runnable
{
- private final Runnable _delegate;
+ private final Runnable delegate;
public SimpleRunner(Runnable delegate)
{
- _delegate = delegate;
+ this.delegate = delegate;
}
public void run()
{
- _delegate.run();
+ delegate.run();
}
}
static class SynchronizedRunner implements Runnable
{
- private final Runnable _delegate;
+ private final Runnable delegate;
public SynchronizedRunner(Runnable delegate)
{
- _delegate = delegate;
+ this.delegate = delegate;
}
public synchronized void run()
{
- _delegate.run();
+ delegate.run();
}
}
static class ReadWriteLockAspectRunner implements Runnable
{
- private final ConcurrentBarrier _barrier = new ConcurrentBarrier();
+ private final ConcurrentBarrier barrier = new ConcurrentBarrier();
- private final Runnable _delegate;
+ private final Runnable delegate;
public ReadWriteLockAspectRunner(Runnable delegate)
{
- _delegate = delegate;
+ this.delegate = delegate;
}
public void run()
{
- _barrier.withRead(_delegate);
+ barrier.withRead(delegate);
}
}
static class ReadWriteLockRunner implements Runnable
{
- private final Runnable _delegate;
+ private final Runnable delegate;
- private final ReadWriteLock _lock = new ReentrantReadWriteLock();
+ private final ReadWriteLock lock = new ReentrantReadWriteLock();
public ReadWriteLockRunner(Runnable delegate)
{
- _delegate = delegate;
+ this.delegate = delegate;
}
public void run()
@@ -120,13 +118,13 @@
try
{
- _lock.readLock().lock();
+ lock.readLock().lock();
- _delegate.run();
+ delegate.run();
}
finally
{
- _lock.readLock().unlock();
+ lock.readLock().unlock();
}
}
@@ -138,20 +136,20 @@
static class BlockRunner implements Runnable
{
- private final Runnable _delegate;
+ private final Runnable delegate;
- private final int _blockSize;
+ private final int blockSize;
public BlockRunner(int blockSize, Runnable delegate)
{
- _blockSize = blockSize;
- _delegate = delegate;
+ this.blockSize = blockSize;
+ this.delegate = delegate;
}
public void run()
{
- for (int i = 0; i < _blockSize; i++)
- _delegate.run();
+ for (int i = 0; i < blockSize; i++)
+ delegate.run();
}
}
Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/HibernateEntityValueEncoder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/HibernateEntityValueEncoder.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/HibernateEntityValueEncoder.java (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/HibernateEntityValueEncoder.java Sun May 11 10:00:04 2008
@@ -28,24 +28,28 @@
public final class HibernateEntityValueEncoder<E> implements ValueEncoder<E>
{
- private final Class<E> _entityClass;
- private final Session _session;
- private final TypeCoercer _typeCoercer;
- private final String _idPropertyName;
- private final PropertyAdapter _propertyAdapter;
+ private final Class<E> entityClass;
+
+ private final Session session;
+
+ private final TypeCoercer typeCoercer;
+
+ private final String idPropertyName;
+
+ private final PropertyAdapter propertyAdapter;
public HibernateEntityValueEncoder(Class<E> entityClass, PersistentClass persistentClass, Session session,
PropertyAccess propertyAccess, TypeCoercer typeCoercer)
{
- _entityClass = entityClass;
- _session = session;
- _typeCoercer = typeCoercer;
+ this.entityClass = entityClass;
+ this.session = session;
+ this.typeCoercer = typeCoercer;
Property property = persistentClass.getIdentifierProperty();
- _idPropertyName = property.getName();
+ idPropertyName = property.getName();
- _propertyAdapter = propertyAccess.getAdapter(_entityClass).getPropertyAdapter(_idPropertyName);
+ propertyAdapter = propertyAccess.getAdapter(this.entityClass).getPropertyAdapter(idPropertyName);
}
@@ -53,14 +57,14 @@
{
if (value == null) return null;
- Object id = _propertyAdapter.get(value);
+ Object id = propertyAdapter.get(value);
if (id == null)
throw new IllegalStateException(String.format(
"Entity %s has an %s property of null; this probably means that it has not been persisted yet.",
- value, _idPropertyName));
+ value, idPropertyName));
- return _typeCoercer.coerce(id, String.class);
+ return typeCoercer.coerce(id, String.class);
}
@SuppressWarnings("unchecked")
@@ -68,11 +72,11 @@
{
if (InternalUtils.isBlank(clientValue)) return null;
- Object id = _typeCoercer.coerce(clientValue, _propertyAdapter.getType());
+ Object id = typeCoercer.coerce(clientValue, propertyAdapter.getType());
Serializable ser = Defense.cast(id, Serializable.class, "id");
- return (E) _session.get(_entityClass, ser);
+ return (E) session.get(entityClass, ser);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/HibernateTransactionDecoratorImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/HibernateTransactionDecoratorImpl.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/HibernateTransactionDecoratorImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/HibernateTransactionDecoratorImpl.java Sun May 11 10:00:04 2008
@@ -35,7 +35,7 @@
* The rules for advice are the same for any method: commit on success or checked exception, abort on thrown
* exception ... so we can use a single shared advice object.
*/
- private final MethodAdvice _advice = new MethodAdvice()
+ private final MethodAdvice advice = new MethodAdvice()
{
public void advise(Invocation invocation)
{
@@ -79,7 +79,7 @@
{
if (m.getAnnotation(CommitAfter.class) != null)
{
- builder.adviseMethod(m, _advice);
+ builder.adviseMethod(m, advice);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/PersistEntity.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/PersistEntity.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/PersistEntity.java (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/PersistEntity.java Sun May 11 10:00:04 2008
@@ -37,7 +37,7 @@
private Session session;
@Inject
- private HibernateSessionManager _manager;
+ private HibernateSessionManager manager;
void onCreateEntity()
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/RegistryImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/RegistryImpl.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/RegistryImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/RegistryImpl.java Sun May 11 10:00:04 2008
@@ -761,13 +761,13 @@
ObjectCreator justInTime = new ObjectCreator()
{
- private Object _delegate;
+ private Object delegate;
public synchronized Object createObject()
{
- if (_delegate == null) _delegate = autobuildCreator.createObject();
+ if (delegate == null) delegate = autobuildCreator.createObject();
- return _delegate;
+ return delegate;
}
};
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ServiceBinderImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ServiceBinderImpl.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ServiceBinderImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ServiceBinderImpl.java Sun May 11 10:00:04 2008
@@ -48,17 +48,17 @@
this.defaultMarkers = defaultMarkers;
}
- private String _serviceId;
+ private String serviceId;
- private Class _serviceInterface;
+ private Class serviceInterface;
- private final Set<Class> _markers = CollectionFactory.newSet();
+ private final Set<Class> markers = CollectionFactory.newSet();
- private Class _serviceImplementation;
+ private Class serviceImplementation;
- private boolean _eagerLoad;
+ private boolean eagerLoad;
- private String _scope;
+ private String scope;
public void finish()
{
@@ -69,7 +69,7 @@
protected void flush()
{
- if (_serviceInterface == null) return;
+ if (serviceInterface == null) return;
final Constructor constructor = findConstructor();
@@ -88,26 +88,26 @@
// Combine service-specific markers with those inherited form the module.
Set<Class> markers = CollectionFactory.newSet(defaultMarkers);
- markers.addAll(_markers);
+ markers.addAll(this.markers);
- ServiceDef serviceDef = new ServiceDefImpl(_serviceInterface, _serviceId, markers, _scope, _eagerLoad, source);
+ ServiceDef serviceDef = new ServiceDefImpl(serviceInterface, serviceId, markers, scope, eagerLoad, source);
accumulator.addServiceDef(serviceDef);
- _serviceId = null;
- _serviceInterface = null;
- _markers.clear();
- _serviceImplementation = null;
- _eagerLoad = false;
- _scope = null;
+ serviceId = null;
+ serviceInterface = null;
+ this.markers.clear();
+ serviceImplementation = null;
+ eagerLoad = false;
+ scope = null;
}
private Constructor findConstructor()
{
- Constructor result = InternalUtils.findAutobuildConstructor(_serviceImplementation);
+ Constructor result = InternalUtils.findAutobuildConstructor(serviceImplementation);
if (result == null) throw new RuntimeException(IOCMessages
- .noConstructor(_serviceImplementation, _serviceId));
+ .noConstructor(serviceImplementation, serviceId));
return result;
}
@@ -126,24 +126,24 @@
flush();
- _serviceInterface = serviceInterface;
- _serviceImplementation = serviceImplementation;
+ this.serviceInterface = serviceInterface;
+ this.serviceImplementation = serviceImplementation;
// Set defaults for the other properties.
- _eagerLoad = serviceImplementation.getAnnotation(EagerLoad.class) != null;
- _serviceId = serviceInterface.getSimpleName();
+ eagerLoad = serviceImplementation.getAnnotation(EagerLoad.class) != null;
+ serviceId = serviceInterface.getSimpleName();
Scope scope = serviceImplementation.getAnnotation(Scope.class);
- _scope = scope != null ? scope.value() : IOCConstants.DEFAULT_SCOPE;
+ this.scope = scope != null ? scope.value() : IOCConstants.DEFAULT_SCOPE;
Marker marker = serviceImplementation.getAnnotation(Marker.class);
if (marker != null)
{
InternalUtils.validateMarkerAnnotations(marker.value());
- _markers.addAll(Arrays.asList(marker.value()));
+ markers.addAll(Arrays.asList(marker.value()));
}
return this;
@@ -153,7 +153,7 @@
{
lock.check();
- _eagerLoad = true;
+ eagerLoad = true;
return this;
}
@@ -164,7 +164,7 @@
lock.check();
- _serviceId = id;
+ serviceId = id;
return this;
}
@@ -175,7 +175,7 @@
lock.check();
- _scope = scope;
+ this.scope = scope;
return this;
}
@@ -186,7 +186,7 @@
InternalUtils.validateMarkerAnnotations(marker);
- _markers.addAll(Arrays.asList(marker));
+ markers.addAll(Arrays.asList(marker));
return this;
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ServiceDecoratorImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ServiceDecoratorImpl.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ServiceDecoratorImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ServiceDecoratorImpl.java Sun May 11 10:00:04 2008
@@ -37,7 +37,7 @@
private final Map<Class, Object> parameterDefaults = newMap();
- private final Logger _logger;
+ private final Logger logger;
private final ServiceResources resources;
@@ -55,12 +55,12 @@
this.moduleBuilderSource = moduleBuilderSource;
this.resources = resources;
serviceInterface = resources.getServiceInterface();
- _logger = resources.getLogger();
+ logger = resources.getLogger();
this.classFactory = classFactory;
parameterDefaults.put(String.class, serviceId);
parameterDefaults.put(ServiceResources.class, resources);
- parameterDefaults.put(Logger.class, _logger);
+ parameterDefaults.put(Logger.class, logger);
parameterDefaults.put(Class.class, serviceInterface);
}
@@ -77,7 +77,7 @@
Map<Class, Object> parameterDefaults = newMap(this.parameterDefaults);
parameterDefaults.put(Object.class, delegate);
- if (_logger.isDebugEnabled()) _logger.debug(IOCMessages.invokingMethod(methodId()));
+ if (logger.isDebugEnabled()) logger.debug(IOCMessages.invokingMethod(methodId()));
Object result = null;
Throwable failure = null;
@@ -112,7 +112,7 @@
if (result != null && !serviceInterface.isInstance(result))
{
- _logger.warn(IOCMessages.decoratorReturnedWrongType(
+ logger.warn(IOCMessages.decoratorReturnedWrongType(
decoratorMethod,
serviceId,
result,
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/AspectDecoratorImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/AspectDecoratorImpl.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/AspectDecoratorImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/AspectDecoratorImpl.java Sun May 11 10:00:04 2008
@@ -58,20 +58,20 @@
return new AspectInterceptorBuilder<T>()
{
- private AspectInterceptorBuilder<T> _builder;
+ private AspectInterceptorBuilder<T> builder;
public void adviseMethod(Method method, MethodAdvice advice)
{
- if (_builder == null)
- _builder = new AspectInterceptorBuilderImpl<T>(classFactory, serviceInterface, delegate,
- description);
+ if (builder == null)
+ builder = new AspectInterceptorBuilderImpl<T>(classFactory, serviceInterface, delegate,
+ description);
- _builder.adviseMethod(method, advice);
+ builder.adviseMethod(method, advice);
}
public T build()
{
- return _builder == null ? delegate : _builder.build();
+ return builder == null ? delegate : builder.build();
}
};
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/SymbolSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/SymbolSourceImpl.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/SymbolSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/SymbolSourceImpl.java Sun May 11 10:00:04 2008
@@ -30,7 +30,7 @@
/**
* Cache of symbol name to fully expanded symbol value.
*/
- private final Map<String, String> _cache = CollectionFactory.newConcurrentMap();
+ private final Map<String, String> cache = CollectionFactory.newConcurrentMap();
/**
* Contains execution data needed when performing an expansion (largely, to check for endless recursion).
@@ -92,13 +92,13 @@
String valueForSymbol(String symbolName)
{
- String value = _cache.get(symbolName);
+ String value = cache.get(symbolName);
if (value == null)
{
value = expandSymbol(symbolName);
- _cache.put(symbolName, value);
+ cache.put(symbolName, value);
}
return value;
@@ -206,7 +206,7 @@
public String valueForSymbol(String symbolName)
{
- String value = _cache.get(symbolName);
+ String value = cache.get(symbolName);
// If already in the cache, then return it. Otherwise, let the SE find the value and
// update the cache.
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/util/IdAllocator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/util/IdAllocator.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/util/IdAllocator.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/util/IdAllocator.java Sun May 11 10:00:04 2008
@@ -43,18 +43,18 @@
*/
private static class NameGenerator implements Cloneable
{
- private final String _baseId;
+ private final String baseId;
- private int _index;
+ private int index;
NameGenerator(String baseId)
{
- _baseId = baseId + SEPARATOR;
+ this.baseId = baseId + SEPARATOR;
}
public String nextId()
{
- return _baseId + _index++;
+ return baseId + index++;
}
/**
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/util/InheritanceSearch.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/util/InheritanceSearch.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/util/InheritanceSearch.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/util/InheritanceSearch.java Sun May 11 10:00:04 2008
@@ -54,7 +54,7 @@
CLASS, INTERFACE, DONE
}
- private State _state;
+ private State state;
public InheritanceSearch(Class searchClass)
{
@@ -62,7 +62,7 @@
queueInterfaces(searchClass);
- _state = searchClass == Object.class ? State.INTERFACE : State.CLASS;
+ state = searchClass == Object.class ? State.INTERFACE : State.CLASS;
}
private void queueInterfaces(Class searchClass)
@@ -83,12 +83,12 @@
public boolean hasNext()
{
- return _state != State.DONE;
+ return state != State.DONE;
}
public Class next()
{
- switch (_state)
+ switch (state)
{
case CLASS:
@@ -96,7 +96,7 @@
searchClass = parentOf(searchClass);
- if (searchClass == null) _state = State.INTERFACE;
+ if (searchClass == null) state = State.INTERFACE;
else queueInterfaces(searchClass);
return result;
@@ -105,7 +105,7 @@
if (interfaceQueue.isEmpty())
{
- _state = State.DONE;
+ state = State.DONE;
return Object.class;
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/util/Orderer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/util/Orderer.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/util/Orderer.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/util/Orderer.java Sun May 11 10:00:04 2008
@@ -39,12 +39,12 @@
private final Map<String, Orderable<T>> idToOrderable = CollectionFactory.newCaseInsensitiveMap();
- private final Map<String, DependencyNode<T>> _dependencyNodesById = CollectionFactory.newCaseInsensitiveMap();
+ private final Map<String, DependencyNode<T>> dependencyNodesById = CollectionFactory.newCaseInsensitiveMap();
// Special node that is always dead last: all other nodes are a dependency
// of the trailer.
- private DependencyNode<T> _trailer;
+ private DependencyNode<T> trailer;
interface DependencyLinker<T>
{
@@ -124,7 +124,7 @@
List<T> result = newList();
- for (Orderable<T> orderable : _trailer.getOrdered())
+ for (Orderable<T> orderable : trailer.getOrdered())
{
T target = orderable.getTarget();
@@ -138,7 +138,7 @@
private void initializeGraph()
{
- _trailer = new DependencyNode<T>(logger, new Orderable<T>("*-trailer-*", null));
+ trailer = new DependencyNode<T>(logger, new Orderable<T>("*-trailer-*", null));
addNodes();
@@ -151,9 +151,9 @@
{
DependencyNode<T> node = new DependencyNode<T>(logger, orderable);
- _dependencyNodesById.put(orderable.getId(), node);
+ dependencyNodesById.put(orderable.getId(), node);
- _trailer.addDependency(node);
+ trailer.addDependency(node);
}
}
@@ -202,7 +202,7 @@
{
Collection<DependencyNode<T>> nodes = findDependencies(sourceId, patternList);
- DependencyNode<T> source = _dependencyNodesById.get(sourceId);
+ DependencyNode<T> source = dependencyNodesById.get(sourceId);
for (DependencyNode<T> target : nodes)
{
@@ -216,11 +216,11 @@
Collection<DependencyNode<T>> result = newList();
- for (String id : _dependencyNodesById.keySet())
+ for (String id : dependencyNodesById.keySet())
{
if (sourceId.equals(id)) continue;
- if (matcher.matches(id)) result.add(_dependencyNodesById.get(id));
+ if (matcher.matches(id)) result.add(dependencyNodesById.get(id));
}
return result;
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/CoercionTuple.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/CoercionTuple.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/CoercionTuple.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/CoercionTuple.java Sun May 11 10:00:04 2008
@@ -39,16 +39,16 @@
*/
private class CoercionWrapper<WS, WT> implements Coercion<WS, WT>
{
- private final Coercion<WS, WT> _coercion;
+ private final Coercion<WS, WT> coercion;
public CoercionWrapper(Coercion<WS, WT> coercion)
{
- _coercion = coercion;
+ this.coercion = coercion;
}
public WT coerce(WS input)
{
- return _coercion.coerce(input);
+ return coercion.coerce(input);
}
@Override
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/CaseInsensitiveMap.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/CaseInsensitiveMap.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/CaseInsensitiveMap.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/CaseInsensitiveMap.java Sun May 11 10:00:04 2008
@@ -301,7 +301,7 @@
private transient int modCount = 0;
- private transient Set<Map.Entry<String, V>> _entrySet;
+ private transient Set<Map.Entry<String, V>> entrySet;
public CaseInsensitiveMap()
{
@@ -377,9 +377,9 @@
@Override
public Set<Map.Entry<String, V>> entrySet()
{
- if (_entrySet == null) _entrySet = new EntrySet();
+ if (entrySet == null) entrySet = new EntrySet();
- return _entrySet;
+ return entrySet;
}
private Position select(Object key)
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/StrategyRegistry.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/StrategyRegistry.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/StrategyRegistry.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/StrategyRegistry.java Sun May 11 10:00:04 2008
@@ -15,7 +15,6 @@
package org.apache.tapestry.ioc.util;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.*;
import org.apache.tapestry.ioc.internal.util.InheritanceSearch;
import java.util.Collection;
@@ -34,14 +33,14 @@
private final boolean allowNonMatch;
- private final Map<Class, A> registrations = newMap();
+ private final Map<Class, A> registrations = CollectionFactory.newMap();
- private final Map<Class, A> cache = newConcurrentMap();
+ private final Map<Class, A> cache = CollectionFactory.newConcurrentMap();
/**
* Used to identify types for which there is no matching adapter; we're using it as if it were a ConcurrentSet.
*/
- private final Map<Class, Boolean> _unmatched = newConcurrentMap();
+ private final Map<Class, Boolean> unmatched = CollectionFactory.newConcurrentMap();
private StrategyRegistry(Class<A> adapterType, Map<Class, A> registrations, boolean allowNonMatch)
{
@@ -80,7 +79,7 @@
public void clearCache()
{
cache.clear();
- _unmatched.clear();
+ unmatched.clear();
}
public Class<A> getAdapterType()
@@ -116,7 +115,7 @@
if (result != null) return result;
- if (_unmatched.containsKey(type)) return null;
+ if (unmatched.containsKey(type)) return null;
result = findMatch(type);
@@ -130,7 +129,7 @@
}
else
{
- _unmatched.put(type, true);
+ unmatched.put(type, true);
}
return result;
@@ -150,7 +149,7 @@
// Report the error. These things really confused the hell out of people in Tap4, so we're
// going the extra mile on the exception message.
- List<String> names = newList();
+ List<String> names = CollectionFactory.newList();
for (Class t : registrations.keySet())
names.add(t.getName());
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ExceptionAnalyzerImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ExceptionAnalyzerImplTest.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ExceptionAnalyzerImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ExceptionAnalyzerImplTest.java Sun May 11 10:00:04 2008
@@ -28,18 +28,18 @@
public class ExceptionAnalyzerImplTest extends IOCInternalTestCase
{
- private ExceptionAnalyzer _analyzer;
+ private ExceptionAnalyzer analyzer;
@BeforeClass
public void setup_analyzer()
{
- _analyzer = getService("ExceptionAnalyzer", ExceptionAnalyzer.class);
+ analyzer = getService("ExceptionAnalyzer", ExceptionAnalyzer.class);
}
@AfterClass
public void cleanup_analyzer()
{
- _analyzer = null;
+ analyzer = null;
}
@Test
@@ -49,7 +49,7 @@
Throwable t = new RuntimeException(message);
- ExceptionAnalysis ea = _analyzer.analyze(t);
+ ExceptionAnalysis ea = analyzer.analyze(t);
assertEquals(ea.getExceptionInfos().size(), 1);
@@ -71,7 +71,7 @@
Throwable t = new TapestryException("Message", l, null);
- ExceptionAnalysis ea = _analyzer.analyze(t);
+ ExceptionAnalysis ea = analyzer.analyze(t);
assertEquals(ea.getExceptionInfos().size(), 1);
@@ -90,7 +90,7 @@
Throwable inner = new RuntimeException("Inner");
Throwable outer = new RuntimeException("Outer", inner);
- ExceptionAnalysis ea = _analyzer.analyze(outer);
+ ExceptionAnalysis ea = analyzer.analyze(outer);
assertEquals(ea.getExceptionInfos().size(), 2);
@@ -112,7 +112,7 @@
Throwable middle = new RuntimeException("Middle", inner);
Throwable outer = new RuntimeException("Outer: Middle", middle);
- ExceptionAnalysis ea = _analyzer.analyze(outer);
+ ExceptionAnalysis ea = analyzer.analyze(outer);
assertEquals(ea.getExceptionInfos().size(), 2);
@@ -138,7 +138,7 @@
Throwable middle = new TapestryException("Middle", l, inner);
Throwable outer = new RuntimeException("Outer: Middle", middle);
- ExceptionAnalysis ea = _analyzer.analyze(outer);
+ ExceptionAnalysis ea = analyzer.analyze(outer);
assertEquals(ea.getExceptionInfos().size(), 3);
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/PropertyAccessImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/PropertyAccessImplTest.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/PropertyAccessImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/PropertyAccessImplTest.java Sun May 11 10:00:04 2008
@@ -39,16 +39,16 @@
public static class Bean
{
- private int _value;
+ private int value;
public int getValue()
{
- return _value;
+ return value;
}
public void setValue(int value)
{
- _value = value;
+ this.value = value;
}
@Override
@@ -137,16 +137,16 @@
public static class BooleanHolder
{
- private boolean _flag;
+ private boolean flag;
public boolean isFlag()
{
- return _flag;
+ return flag;
}
public void setFlag(boolean flag)
{
- _flag = flag;
+ this.flag = flag;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/services/PropertyShadowBuilderImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/services/PropertyShadowBuilderImplTest.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/services/PropertyShadowBuilderImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/services/PropertyShadowBuilderImplTest.java Sun May 11 10:00:04 2008
@@ -48,25 +48,25 @@
public class FooHolder
{
- private Foo _foo;
+ private Foo foo;
- private int _count = 0;
+ private int count = 0;
public Foo getFoo()
{
- _count++;
+ count++;
- return _foo;
+ return foo;
}
public int getCount()
{
- return _count;
+ return count;
}
public void setFoo(Foo foo)
{
- _foo = foo;
+ this.foo = foo;
}
@Override
Modified: tapestry/tapestry5/trunk/tapestry-spring/src/test/java/org/example/testapp/pages/Start.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-spring/src/test/java/org/example/testapp/pages/Start.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-spring/src/test/java/org/example/testapp/pages/Start.java (original)
+++ tapestry/tapestry5/trunk/tapestry-spring/src/test/java/org/example/testapp/pages/Start.java Sun May 11 10:00:04 2008
@@ -25,7 +25,7 @@
public class Start
{
@Retain
- private String _input;
+ private String input;
// We're matching on type here, just as we would a service provided in a T5 IoC module.
@Inject
@@ -36,17 +36,17 @@
void onSuccess()
{
- _input = upcaseBean.toUpperCase(_input);
+ input = upcaseBean.toUpperCase(input);
}
public String getInput()
{
- return _input;
+ return input;
}
public void setInput(String input)
{
- _input = input;
+ this.input = input;
}
public String getSpringBeans()
Modified: tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/AbstractIntegrationTestSuite.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/AbstractIntegrationTestSuite.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/AbstractIntegrationTestSuite.java (original)
+++ tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/AbstractIntegrationTestSuite.java Sun May 11 10:00:04 2008
@@ -68,7 +68,7 @@
private final String webappRoot;
- private final String _seleniumBrowserCommand;
+ private final String seleniumBrowserCommand;
private JettyRunner jettyRunner;
@@ -100,7 +100,7 @@
protected AbstractIntegrationTestSuite(String webAppRoot, String browserCommand)
{
webappRoot = webAppRoot;
- _seleniumBrowserCommand = browserCommand;
+ seleniumBrowserCommand = browserCommand;
}
protected final void assertSourcePresent(String... expected)
@@ -255,7 +255,7 @@
server.start();
CommandProcessor cp = new HttpCommandProcessor("localhost", SeleniumServer.DEFAULT_PORT,
- _seleniumBrowserCommand, BASE_URL);
+ seleniumBrowserCommand, BASE_URL);
selenium = new DefaultSelenium(new ErrorReportingCommandProcessor(cp));
Modified: tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/forms2.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/forms2.apt?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/forms2.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/forms2.apt Sun May 11 10:00:04 2008
@@ -435,11 +435,16 @@
}
----
+ Here, we're using the Hibernate Session object to find all Address objects in the database.
+ Any sorting that takes place will be done in memory. This is fine for now (with only
+ a handful of Address objects in the database). Later we'll
+ see how to optimize this for very large result sets.
+
What's Next?
We have lots more to talk about: more components, more customizations, built-in Ajax support,
more common design and implementation patterns,
- and event writing your own components (which is easy!).
+ and even writing your own components (which is easy!).
... but Tapestry and this tutorial are a work in progress, so stay patient, and check out
the other Tapestry tutorials and resources available on the
Modified: tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/MultipartDecoderImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/MultipartDecoderImpl.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/MultipartDecoderImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/MultipartDecoderImpl.java Sun May 11 10:00:04 2008
@@ -21,7 +21,7 @@
import org.apache.commons.fileupload.servlet.ServletFileUpload;
import org.apache.tapestry.ioc.annotations.Inject;
import org.apache.tapestry.ioc.annotations.Symbol;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.ioc.services.ThreadCleanupListener;
import org.apache.tapestry.upload.services.MultipartDecoder;
import org.apache.tapestry.upload.services.UploadSymbols;
@@ -38,7 +38,7 @@
*/
public class MultipartDecoderImpl implements MultipartDecoder, ThreadCleanupListener
{
- private final Map<String, UploadedFileItem> _uploads = newMap();
+ private final Map<String, UploadedFileItem> uploads = CollectionFactory.newMap();
private final String repositoryLocation;
@@ -70,7 +70,7 @@
public UploadedFile getFileUpload(String parameterName)
{
- return _uploads.get(parameterName);
+ return uploads.get(parameterName);
}
public HttpServletRequest decode(HttpServletRequest request)
@@ -82,7 +82,7 @@
public void threadDidCleanup()
{
- for (UploadedFileItem uploaded : _uploads.values())
+ for (UploadedFileItem uploaded : uploads.values())
{
uploaded.cleanup();
}
@@ -155,6 +155,6 @@
protected void addUploadedFile(String name, UploadedFileItem file)
{
- _uploads.put(name, file);
+ uploads.put(name, file);
}
}