You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2008/05/08 17:19:06 UTC
svn commit: r654547 - in /tapestry/tapestry5/trunk/tapestry-core/src:
main/java/org/apache/tapestry/test/ main/java/org/apache/tapestry/util/
main/java/org/apache/tapestry/validator/ site/apt/ site/apt/guide/
Author: hlship
Date: Thu May 8 08:19:05 2008
New Revision: 654547
URL: http://svn.apache.org/viewvc?rev=654547&view=rev
Log:
Remove leading underscores from field names
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/test/PageTester.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/DefaultPrimaryKeyEncoder.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/EnumSelectModel.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/EnumValueEncoder.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/StringToEnumCoercion.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/TextStreamResponse.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/validator/AbstractValidator.java
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/ajax.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/appstate.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/assets.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/beaneditform.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/coercion.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/component-classes.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/env.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/event.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/inject.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/localization.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/logging.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/mixins.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/pagenav.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/parameters.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/persist.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/rendering.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/validation.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/index.apt
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/test/PageTester.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/test/PageTester.java?rev=654547&r1=654546&r2=654547&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/test/PageTester.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/test/PageTester.java Thu May 8 08:19:05 2008
@@ -41,17 +41,17 @@
*/
public class PageTester implements ComponentInvoker
{
- private final Registry _registry;
+ private final Registry registry;
- private final ComponentInvocationMap _invocationMap;
+ private final ComponentInvocationMap invocationMap;
- private final TestableRequest _request;
+ private final TestableRequest request;
- private final StrategyRegistry<ComponentInvoker> _invokerRegistry;
+ private final StrategyRegistry<ComponentInvoker> invokerRegistry;
- private Locale _preferedLanguage;
+ private Locale preferedLanguage;
- private final LocalizationSetter _localizationSetter;
+ private final LocalizationSetter localizationSetter;
public static final String DEFAULT_CONTEXT_PATH = "src/main/webapp";
@@ -81,7 +81,7 @@
*/
public PageTester(String appPackage, String appName, String contextPath, Class... moduleClasses)
{
- _preferedLanguage = Locale.ENGLISH;
+ preferedLanguage = Locale.ENGLISH;
SymbolProvider provider = new SingleKeySymbolProvider(InternalConstants.TAPESTRY_APP_PACKAGE_PARAM, appPackage);
@@ -91,23 +91,23 @@
initializer.addModules(moduleClasses);
initializer.addModules(provideExtraModuleDefs());
- _registry = initializer.getRegistry();
+ registry = initializer.getRegistry();
- _request = _registry.getObject(TestableRequest.class, null);
+ request = registry.getObject(TestableRequest.class, null);
- _localizationSetter = _registry.getService("LocalizationSetter", LocalizationSetter.class);
+ localizationSetter = registry.getService("LocalizationSetter", LocalizationSetter.class);
- _invocationMap = _registry.getObject(ComponentInvocationMap.class, null);
+ invocationMap = registry.getObject(ComponentInvocationMap.class, null);
- ApplicationGlobals globals = _registry.getObject(ApplicationGlobals.class, null);
+ ApplicationGlobals globals = registry.getObject(ApplicationGlobals.class, null);
globals.storeContext(new PageTesterContext(contextPath));
Map<Class, ComponentInvoker> map = newMap();
- map.put(PageLinkTarget.class, new PageLinkInvoker(_registry));
- map.put(ActionLinkTarget.class, new ActionLinkInvoker(_registry, this, _invocationMap));
+ map.put(PageLinkTarget.class, new PageLinkInvoker(registry));
+ map.put(ActionLinkTarget.class, new ActionLinkInvoker(registry, this, invocationMap));
- _invokerRegistry = StrategyRegistry.newInstance(ComponentInvoker.class, map);
+ invokerRegistry = StrategyRegistry.newInstance(ComponentInvoker.class, map);
}
/**
@@ -125,7 +125,7 @@
*/
public void shutdown()
{
- _registry.shutdown();
+ registry.shutdown();
}
@@ -134,7 +134,7 @@
*/
public Registry getRegistry()
{
- return _registry;
+ return registry;
}
/**
@@ -145,7 +145,7 @@
*/
public <T> T getService(Class<T> serviceInterface)
{
- return _registry.getService(serviceInterface);
+ return registry.getService(serviceInterface);
}
/**
@@ -176,7 +176,7 @@
private ComponentInvocation getInvocation(Element element)
{
- ComponentInvocation invocation = _invocationMap.get(element);
+ ComponentInvocation invocation = invocationMap.get(element);
if (invocation == null)
throw new IllegalArgumentException("No component invocation object is associated with the Element.");
@@ -188,18 +188,18 @@
{
// It is critical to clear the map before invoking an invocation (render a page or click a
// link).
- _invocationMap.clear();
+ invocationMap.clear();
setThreadLocale();
- ComponentInvoker invoker = _invokerRegistry.getByInstance(invocation.getTarget());
+ ComponentInvoker invoker = invokerRegistry.getByInstance(invocation.getTarget());
return invoker.invoke(invocation);
}
private void setThreadLocale()
{
- _localizationSetter.setThreadLocale(_preferedLanguage);
+ localizationSetter.setThreadLocale(preferedLanguage);
}
/**
@@ -213,9 +213,9 @@
{
notNull(form, "form");
- _request.clear();
+ request.clear();
- _request.loadParameters(parameters);
+ request.loadParameters(parameters);
addHiddenFormFields(form);
@@ -275,7 +275,7 @@
private void addHiddenFormFields(Element element)
{
if (isHiddenFormField(element))
- _request.loadParameter(element.getAttribute("name"), element.getAttribute("value"));
+ request.loadParameter(element.getAttribute("name"), element.getAttribute("value"));
for (Node child : element.getChildren())
{
@@ -293,6 +293,6 @@
public void setPreferedLanguage(Locale preferedLanguage)
{
- _preferedLanguage = preferedLanguage;
+ this.preferedLanguage = preferedLanguage;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/DefaultPrimaryKeyEncoder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/DefaultPrimaryKeyEncoder.java?rev=654547&r1=654546&r2=654547&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/DefaultPrimaryKeyEncoder.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/DefaultPrimaryKeyEncoder.java Thu May 8 08:19:05 2008
@@ -15,7 +15,7 @@
package org.apache.tapestry.util;
import org.apache.tapestry.PrimaryKeyEncoder;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.*;
+import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.ioc.internal.util.Defense;
import java.io.Serializable;
@@ -35,13 +35,13 @@
*/
public class DefaultPrimaryKeyEncoder<K extends Serializable, V> implements PrimaryKeyEncoder<K, V>
{
- private final Map<K, V> _keyToValue = new LinkedHashMap<K, V>();
+ private final Map<K, V> keyToValue = new LinkedHashMap<K, V>();
- private final Map<V, K> _valueToKey = newMap();
+ private final Map<V, K> valueToKey = CollectionFactory.newMap();
- private Set<K> _deletedKeys;
+ private Set<K> deletedKeys;
- private K _currentKey;
+ private K currentKey;
/**
* Adds a new key/value pair to the encoder.
@@ -51,14 +51,14 @@
Defense.notNull(key, "key");
Defense.notNull(value, "value");
- V existing = _keyToValue.get(key);
+ V existing = keyToValue.get(key);
if (existing != null) throw new IllegalArgumentException(UtilMessages.duplicateKey(key, value, existing));
- _keyToValue.put(key, value);
+ keyToValue.put(key, value);
// TODO: Ensure that the value is unique?
- _valueToKey.put(value, key);
+ valueToKey.put(value, key);
}
/**
@@ -69,7 +69,7 @@
*/
public final List<V> getValues()
{
- return valuesNotInKeySet(_deletedKeys);
+ return valuesNotInKeySet(deletedKeys);
}
/**
@@ -83,9 +83,9 @@
{
if (keySet == null || keySet.isEmpty()) return getAllValues();
- List<V> result = newList();
+ List<V> result = CollectionFactory.newList();
- for (Map.Entry<K, V> entry : _keyToValue.entrySet())
+ for (Map.Entry<K, V> entry : keyToValue.entrySet())
{
if (keySet.contains(entry.getKey())) continue;
@@ -98,9 +98,9 @@
public final List<V> getAllValues()
{
- List<V> result = newList();
+ List<V> result = CollectionFactory.newList();
- for (Map.Entry<K, V> entry : _keyToValue.entrySet())
+ for (Map.Entry<K, V> entry : keyToValue.entrySet())
{
result.add(entry.getValue());
}
@@ -116,27 +116,27 @@
{
Defense.notNull(value, "value");
- _currentKey = _valueToKey.get(value);
+ currentKey = valueToKey.get(value);
- if (_currentKey == null) throw new IllegalArgumentException(UtilMessages.missingValue(value, _valueToKey
+ if (currentKey == null) throw new IllegalArgumentException(UtilMessages.missingValue(value, valueToKey
.keySet()));
- return _currentKey;
+ return currentKey;
}
public final V toValue(K key)
{
- V result = _keyToValue.get(key);
+ V result = keyToValue.get(key);
if (result == null)
{
result = provideMissingObject(key);
- _currentKey = key;
+ currentKey = key;
}
else
{
- _currentKey = key;
+ currentKey = key;
}
return result;
@@ -160,12 +160,12 @@
public final boolean isDeleted()
{
- return inKeySet(_deletedKeys);
+ return inKeySet(deletedKeys);
}
public final void setDeleted(boolean value)
{
- _deletedKeys = modifyKeySet(_deletedKeys, value);
+ deletedKeys = modifyKeySet(deletedKeys, value);
}
/**
@@ -176,7 +176,7 @@
*/
protected final boolean inKeySet(Set<K> keySet)
{
- return keySet != null && keySet.contains(_currentKey);
+ return keySet != null && keySet.contains(currentKey);
}
/**
@@ -196,11 +196,11 @@
{
if (!value) return null;
- keySet = newSet();
+ keySet = CollectionFactory.newSet();
}
- if (value) keySet.add(_currentKey);
- else keySet.remove(_currentKey);
+ if (value) keySet.add(currentKey);
+ else keySet.remove(currentKey);
return keySet;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/EnumSelectModel.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/EnumSelectModel.java?rev=654547&r1=654546&r2=654547&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/EnumSelectModel.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/EnumSelectModel.java Thu May 8 08:19:05 2008
@@ -19,7 +19,7 @@
import org.apache.tapestry.internal.OptionModelImpl;
import org.apache.tapestry.internal.TapestryInternalUtils;
import org.apache.tapestry.ioc.Messages;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
+import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
import java.io.Serializable;
@@ -35,7 +35,7 @@
{
private static final long serialVersionUID = -3590412082766899684L;
- private final List<OptionModel> _options = newList();
+ private final List<OptionModel> options = CollectionFactory.newList();
public <T extends Enum> EnumSelectModel(Class<T> enumClass, Messages messages)
{
@@ -53,7 +53,7 @@
{
String label = TapestryInternalUtils.getLabelForEnum(messages, prefix, value);
- _options.add(new OptionModelImpl(label, value));
+ options.add(new OptionModelImpl(label, value));
}
}
@@ -70,7 +70,7 @@
*/
public List<OptionModel> getOptions()
{
- return _options;
+ return options;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/EnumValueEncoder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/EnumValueEncoder.java?rev=654547&r1=654546&r2=654547&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/EnumValueEncoder.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/EnumValueEncoder.java Thu May 8 08:19:05 2008
@@ -23,13 +23,13 @@
*/
public class EnumValueEncoder<E extends Enum<E>> implements ValueEncoder<E>
{
- private final Class<E> _enumType;
+ private final Class<E> enumType;
public EnumValueEncoder(final Class<E> enumType)
{
notNull(enumType, "enumType");
- _enumType = enumType;
+ this.enumType = enumType;
}
public String toClient(E value)
@@ -44,7 +44,7 @@
{
if (InternalUtils.isBlank(clientValue)) return null;
- return Enum.valueOf(_enumType, clientValue);
+ return Enum.valueOf(enumType, clientValue);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/StringToEnumCoercion.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/StringToEnumCoercion.java?rev=654547&r1=654546&r2=654547&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/StringToEnumCoercion.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/StringToEnumCoercion.java Thu May 8 08:19:05 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.util;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newCaseInsensitiveMap;
+import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.ioc.services.Coercion;
@@ -29,9 +29,9 @@
*/
public final class StringToEnumCoercion<T extends Enum> implements Coercion<String, T>
{
- private final Class<T> _enumClass;
+ private final Class<T> enumClass;
- private final Map<String, T> _stringToEnum = newCaseInsensitiveMap();
+ private final Map<String, T> stringToEnum = CollectionFactory.newCaseInsensitiveMap();
public StringToEnumCoercion(Class<T> enumClass)
{
@@ -40,10 +40,10 @@
public StringToEnumCoercion(Class<T> enumClass, T... values)
{
- _enumClass = enumClass;
+ this.enumClass = enumClass;
for (T value : values)
- _stringToEnum.put(value.name(), value);
+ stringToEnum.put(value.name(), value);
}
public T coerce(String input)
@@ -51,13 +51,13 @@
if (InternalUtils.isBlank(input))
return null;
- T result = _stringToEnum.get(input);
+ T result = stringToEnum.get(input);
if (result == null)
throw new RuntimeException(UtilMessages.missingEnumValue(
input,
- _enumClass,
- _stringToEnum.keySet()));
+ enumClass,
+ stringToEnum.keySet()));
return result;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/TextStreamResponse.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/TextStreamResponse.java?rev=654547&r1=654546&r2=654547&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/TextStreamResponse.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/TextStreamResponse.java Thu May 8 08:19:05 2008
@@ -25,27 +25,25 @@
public class TextStreamResponse implements StreamResponse
{
- private final String _contentType;
+ private final String contentType, text;
- private final String _text;
-
- public TextStreamResponse(final String contentType, final String text)
+ public TextStreamResponse(String contentType, String text)
{
notBlank(contentType, "contentType");
notNull(text, "text");
- _contentType = contentType;
- _text = text;
+ this.contentType = contentType;
+ this.text = text;
}
public String getContentType()
{
- return _contentType;
+ return contentType;
}
public InputStream getStream() throws IOException
{
- return new ByteArrayInputStream(_text.getBytes());
+ return new ByteArrayInputStream(text.getBytes());
}
public void prepareResponse(Response response)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/validator/AbstractValidator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/validator/AbstractValidator.java?rev=654547&r1=654546&r2=654547&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/validator/AbstractValidator.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/validator/AbstractValidator.java Thu May 8 08:19:05 2008
@@ -16,34 +16,37 @@
import org.apache.tapestry.Validator;
+/**
+ * Base class for constructing a {@link org.apache.tapestry.Validator}.
+ */
public abstract class AbstractValidator<C, T> implements Validator<C, T>
{
- private final Class<C> _constraintType;
+ private final Class<C> constraintType;
- private final Class<T> _valueType;
+ private final Class<T> valueType;
- private final String _messageKey;
+ private final String messageKey;
protected AbstractValidator(Class<C> constraintType, Class<T> valueType, String messageKey)
{
- _constraintType = constraintType;
- _valueType = valueType;
- _messageKey = messageKey;
+ this.constraintType = constraintType;
+ this.valueType = valueType;
+ this.messageKey = messageKey;
}
public final Class<C> getConstraintType()
{
- return _constraintType;
+ return constraintType;
}
public final Class<T> getValueType()
{
- return _valueType;
+ return valueType;
}
public String getMessageKey()
{
- return _messageKey;
+ return messageKey;
}
public boolean isRequired()
Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/ajax.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/ajax.apt?rev=654547&r1=654546&r2=654547&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/ajax.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/ajax.apt Thu May 8 08:19:05 2008
@@ -73,14 +73,14 @@
+---+
@Inject @Path("${tapestry.scriptaculous}/dragdrop.js")
- private Asset _dragDropLibrary;
+ private Asset dragDropLibrary;
@Environmental
- private PageRenderSupport _pageRenderSupport;
+ private PageRenderSupport pageRenderSupport;
void setupRender()
{
- _pageRenderSupport.addScriptLink(_dragDropLibrary);
+ pageRenderSupport.addScriptLink(dragDropLibrary);
}
+---+
@@ -115,7 +115,7 @@
+---+
@Environmental
- private PageRenderSupport _pageRenderSupport;
+ private PageRenderSupport pageRenderSupport;
+---+
Environmental only works inside components and occasionally a service may want to
@@ -124,7 +124,7 @@
+---+
@Inject
- private PageRenderSupport _pageRenderSupport;
+ private PageRenderSupport pageRenderSupport;
+----+
... or, in a service implementation constructor:
@@ -191,7 +191,7 @@
+---+
List<String> onProvideCompletionsFromAccountName(String partial)
{
- List<Account> matches = _accountDAO.findByPartialAccountName(partial);
+ List<Account> matches = accountDAO.findByPartialAccountName(partial);
List<String> result = new ArrayList<String>():
Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/appstate.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/appstate.apt?rev=654547&r1=654546&r2=654547&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/appstate.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/appstate.apt Thu May 8 08:19:05 2008
@@ -22,7 +22,7 @@
public class MyPage
{
@ApplicationState
- private MyState _myState;
+ private MyState myState;
. . .
}
@@ -51,7 +51,7 @@
Instead, create a second field:
+---+
- private boolean _myStateExists;
+ private boolean myStateExists;
+---+
This companion field is used to see if the ASO already exists. It is not annotated; it is located by name ("Exists" is appended to the name of the field
@@ -61,10 +61,10 @@
+---+
@ApplicationState(create=false)
- private MyState _myState;
+ private MyState myState;
+---+
- In this case, the _myState field will be null if the MyState ASO does not exist, but will be non-null if it has been
+ In this case, the myState field will be null if the MyState ASO does not exist, but will be non-null if it has been
created (either by assigning a value to the field, or by a different ASO field where create is true).
Persistence Strategies
Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/assets.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/assets.apt?rev=654547&r1=654546&r2=654547&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/assets.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/assets.apt Thu May 8 08:19:05 2008
@@ -24,7 +24,7 @@
+----+
@Inject
@Path("context:images/tapestry_banner.gif")
- private Asset _banner;
+ private Asset banner;
+----+
Assets are located within <domains>; these domains are identified by the prefix on the Inject annotation's value.
@@ -45,7 +45,7 @@
+----+
@Inject
@Path("../edit.png")
- private Asset _icon;
+ private Asset icon;
+----+
Since you must omit the prefix, this only makes sense for components packaged in a library for reuse.
@@ -59,7 +59,7 @@
+----+
@Inject
@Path("${skin.root}/style.css")
- private Asset _style;
+ private Asset style;
+----+
An override of the skin.root symbol would affect all references to the named asset.
Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/beaneditform.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/beaneditform.apt?rev=654547&r1=654546&r2=654547&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/beaneditform.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/beaneditform.apt Thu May 8 08:19:05 2008
@@ -122,34 +122,31 @@
are insufficient. For example, if the the type of the property being edited is an interface type, it may be useful to provide
an explicit BeanModel around an underlying implementation class.
- The model can be created when the page is first loaded:
+ The model can be created when the page is first instantiated:
+---+
public class MyPage
{
@Inject
- private BeanModelSource _beanModelSource;
+ private BeanModelSource beanModelSource;
@Inject
- private ComponentResources _resources;
+ private ComponentResources resources;
@Retain
- private BeanModel _model;
+ private BeanModel model;
- private MyBean _bean;
+ @Property
+ private MyBean bean;
- void pageLoaded()
{
- _model = _beanModelSource.create(MyBean.class, true, _resources);
+ model = beanModelSource.create(MyBean.class, true, resources);
- // Make other changes to _model here.
+ // Make other changes to model here.
}
- public MyBean getBean() { return _bean; }
-
- public void setBean(MyBean bean) { _bean = bean; }
-
- public BeanModel getModel() { return _model; }
+
+ public BeanModel getModel() { return model; }
}
+---+
@@ -187,19 +184,19 @@
public class AppPropertyEditBlocks
{
@Environmental
- private PropertyEditContext _context;
+ private PropertyEditContext context;
@Component(parameters =
{ "value=context.propertyValue", "label=prop:context.label",
"translate=prop:currencyTranslator", "validate=prop:currencyValidator",
"clientId=prop:context.propertyId" })
- private TextField _currency;
+ private TextField currency;
public PropertyEditContext getContext() { return _context; }
public FieldValidator getCurrencyValidator()
{
- return _context.getValidator(_currency);
+ return context.getValidator(_currency);
}
public Translator getCurrencyTranslator()
Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/coercion.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/coercion.apt?rev=654547&r1=654546&r2=654547&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/coercion.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/coercion.apt Thu May 8 08:19:05 2008
@@ -15,13 +15,13 @@
public class Count
{
@Parameter
- private int _start = 1;
+ private int start = 1;
@Parameter(required = true)
- private int _end;
+ private int end;
@Parameter
- private int _value;
+ private int value;
. . .
+---+
Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/component-classes.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/component-classes.apt?rev=654547&r1=654546&r2=654547&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/component-classes.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/component-classes.apt Thu May 8 08:19:05 2008
@@ -137,7 +137,8 @@
will log an error for each component class that contains fields that are neither static nor private.
Be aware that you will need to provide getter and setter methods to access your classes'
- instance variables. Tapestry <does not> do this automatically.
+ instance variables. Tapestry <does not> do this automatically unless you provide
+ the {{{../../apidocs/org/apache/tapestry/annotations/Property.html}Property}} annotation on the field.
Transient Instance Variables
@@ -195,26 +196,18 @@
package org.example.app.pages;
import org.apache.tapestry.annotations.Component;
+import org.apache.tapestry.annotations.Property;
import org.example.app.components.Count;
public class Countdown
{
@Component(parameters =
{ "start=5", "end=1", "value=countValue" })
- private Count _count;
-
- private int _countValue;
+ private Count count;
- public int getCountValue()
- {
- return _countValue;
- }
-
- public void setCountValue(int countValue)
- {
- _countValue = countValue;
- }
-}
+ @Property
+ private int countValue;
+}
+---+
The above defines a component whose embedded id is "count" (this id is derived from the name of the field). The type
@@ -222,11 +215,8 @@
The start and end parameters of the Count component are bound to literal values, and the value
parameter of the Count component is bound to the countValue property of the Countdown component.
- Note that inside the component class, the default binding prefix is always "prop:".
- In the example we could write <<<"value=prop:countValue">>> if we desired to be
- fully explicit.
-
- However, certain literal values, such as the numeric literals in the example,
+ Technically, the start and end parameters should be bound to properties, just the the value parameter. However,
+ certain literal values, such as the numeric literals in the example,
are accepted by the prop: binding prefix even though they are not actually properties (this is largely as a convienience
to the application developer). We could also use the "literal:" prefix, <<<"start=literal:5">>> which accomplishes
largely the same thing.
Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/env.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/env.apt?rev=654547&r1=654546&r2=654547&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/env.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/env.apt Thu May 8 08:19:05 2008
@@ -34,14 +34,14 @@
+---+
@Inject @Path("${tapestry.scriptaculous}/dragdrop.js")
- private Asset _dragDropLibrary;
+ private Asset dragDropLibrary;
@Environmental
- private PageRenderSupport _pageRenderSupport;
+ private PageRenderSupport pageRenderSupport;
void setupRender()
{
- _pageRenderSupport.addScriptLink(_dragDropLibrary);
+ pageRenderSupport.addScriptLink(_dragDropLibrary);
}
+---+
@@ -70,23 +70,23 @@
public class TabGroup
{
@Inject
- private Environment _environment;
+ private Environment environment;
void beginRender()
{
- _environment.push(TabModel.class, new TabModelImpl(...));
+ environment.push(TabModel.class, new TabModelImpl(...));
}
void afterRender()
{
- _environment.pop(TabModel.class);
+ environment.pop(TabModel.class);
}
}
public class Tab
{
@Environmental
- private TabModel _model;
+ private TabModel model;
void beginRender(MarkupWriter writer)
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/event.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/event.apt?rev=654547&r1=654546&r2=654547&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/event.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/event.apt Thu May 8 08:19:05 2008
@@ -76,7 +76,7 @@
@OnEvent(component = "select")
void valueChosen(int value)
{
- _value = value;
+ this.value = value;
}
+---+
@@ -97,7 +97,7 @@
@OnEvent(value = "action", component = "select")
void valueChosen(int value)
{
- _value = value;
+ this.value = value;
}
+---+
@@ -125,7 +125,7 @@
+---+
void onActionFromSelect(int value)
{
- _value = value;
+ this.value = value;
}
+---+
@@ -205,7 +205,7 @@
{
try
{
- _dao.executeQuery();
+ dao.executeQuery();
}
catch (JDBCException ex)
{
@@ -219,7 +219,7 @@
+---+
void onActionFromRunQuery() throws JDBCException
{
- _dao.executeQuery();
+ dao.executeQuery();
}
+----+
@@ -243,7 +243,7 @@
---
Object onException(Throwable cause)
{
- _message = cause.getMessage();
+ message = cause.getMessage();
return this;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/inject.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/inject.apt?rev=654547&r1=654546&r2=654547&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/inject.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/inject.apt Thu May 8 08:19:05 2008
@@ -43,16 +43,16 @@
For field type {{{../../apidocs/org/apache/tapestry/Block.html}Block}}, the value of the Inject annotation is the
id of the {{{templates.apt}\<block\> element}} within the component's template. Normally, the id of the block is determined from the field name
- (by stripping out leading "_" and "$" characters). Where that is not appropriate, an
+ (after stripping out leading "_" and "$" characters). Where that is not appropriate, an
{{{../../apidocs/org/apache/tapestry/annotations/Id.html}Id}} annotation can be supplied:
+---+
@Inject
- private Block _foo;
+ private Block foo;
@Inject
@Id("bar")
- private Block _barBlock;
+ private Block barBlock;
+---+
The first injection will inject the Block with id "foo" (as always, case is ignored). The second injection will inject the Block with id "bar".
@@ -69,7 +69,7 @@
+----+
@Inject
-private ComponentResources _resources;
+private ComponentResources resources;
+----+
Tapestry uses the type of the field, ComponentResources, to determine what to inject into this field.
@@ -104,8 +104,13 @@
+----+
@Inject
@Service("Request")
-private Request _request;
+private Request request;
+----+
+
+ This is generally not necessary; you should always be able to identify the service to be injected just by type, not
+ by explicit id. Explicit ids have the disadvantage of not being refactoring-safe: this won't happen with the Request service,
+ but perhaps in your own ... if you rename the service interface and rename the service id to match, your existing
+ injections using the explicit service id will break.
Default Injection
Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/localization.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/localization.apt?rev=654547&r1=654546&r2=654547&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/localization.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/localization.apt Thu May 8 08:19:05 2008
@@ -95,7 +95,7 @@
+----+
@Inject
- private Messages _messages;
+ private Messages messages;
+----+
You could then <<<get()>>> messages, or <<<format()>>> them:
@@ -104,10 +104,10 @@
public String getCartSummary()
{
- if (_items.isEmpty())
- return _messages.get("no-items");
+ if (items.isEmpty())
+ return messages.get("no-items");
- return _messages.format("item-summary", _items.size());
+ return messages.format("item-summary", _items.size());
}
+----+
Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/logging.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/logging.apt?rev=654547&r1=654546&r2=654547&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/logging.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/logging.apt Thu May 8 08:19:05 2008
@@ -30,21 +30,21 @@
public class MyPage
{
@Inject
- private Logger _logger;
+ private Logger logger;
. . .
---
@Log annotation
- You may mark a method with the {{{../../apidocs/org/apache/tapestry/annotations/Log.html}Log}} annotation.
+ You may mark any component method with the {{{../../apidocs/org/apache/tapestry/annotations/Log.html}Log}} annotation.
Method entry, exit (and any thrown exceptions) will be logged at DEBUG level. This is very convienient for
debugging, especially when placed on event handler methods.
DEBUG Level
- When a component's logger is configured at the DEBUG level, you will see added output when the class is first
+ When a component's logger is configured at the DEBUG level, you will also see added output when the class is first
accessed identifying how Tapestry is modifying the bytecode of the class.
Example:
@@ -124,7 +124,7 @@
TRACE Level
- At the TRACE level <for pages> enables extremely verbose logging of every activity that drives the rendering of output, such as each component
+ Enabling the TRACE level <for pages> results in extremely verbose logging of every activity that drives the rendering of output, such as each component
working its way through the {{{rendering.html}rendering stage machine}}. Example:
----
Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/mixins.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/mixins.apt?rev=654547&r1=654546&r2=654547&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/mixins.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/mixins.apt Thu May 8 08:19:05 2008
@@ -64,7 +64,7 @@
+----+
@Component(parameters=. . .) @Mixins({"Autocomplete", "DefaultFromCookie"})
- private TextField _userId;
+ private TextField userId;
+----+
This example defines a component of type TextField and mixes in the <hypothetical> Autocomplete
@@ -81,7 +81,7 @@
public class AutocompleteField extendes TextField
{
@Mixin
- private Autocomplete _autocompleteMixin;
+ private Autocomplete autocompleteMixin;
. . .
}
@@ -96,7 +96,7 @@
public class AutocompleteField extendes TextField
{
@Mixin("Autocomplete")
- private Object _autocompleteMixin;
+ private Object autocompleteMixin;
. . .
}
@@ -120,7 +120,7 @@
+-----+
@Component(parameters={"Autocomplete.id=auto", . . . }) @Mixins("Autocomplete", "DefaultFromCookie"})
- private TextField _userId;
+ private TextField userId;
+-----+
Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/pagenav.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/pagenav.apt?rev=654547&r1=654546&r2=654547&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/pagenav.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/pagenav.apt Thu May 8 08:19:05 2008
@@ -112,15 +112,19 @@
+---+
public class ProductDetail
{
- private Product _product;
+ private Product product;
. . .
- long onPassivate() { return _product.getId(); }
+ long onPassivate() { return product.getId(); }
}
+----+
The activation context may consist of a series of values, in which case the return value of the method should be an array or a List.
+
+ <<Note: If you are using the {{{../tapestry-hibernate/}tapestry-hibernate}} integration library and your passivate context
+ is a Hibernate entity, then you can just use the entity itself, not its id. Tapestry will automatically extract the entities' id into the URL,
+ and convert it back for the "activate" event handler method.>>
* Page activation
@@ -183,11 +187,11 @@
+---+
@InjectPage
- private ProductDetails _details;
+ private ProductDetails details;
Object onActionFromSelect(long productId)
{
- _details.setProductId(productId);
+ details.setProductId(productId);
return _details;
}
@@ -197,18 +201,18 @@
+----+
@Inject
- private ProductDAO _dao;
+ private ProductDAO dao;
- private Product _product;
+ private Product product;
@Persist
- private long _productId;
+ private long productId;
- public void setProductId(long productId) { _productId = productId; }
+ public void setProductId(long productId) { this.productId = productId; }
void onActivate()
{
- _product = _dao.getById(_productId);
+ product = dao.getById(productId);
}
+----+
@@ -234,22 +238,22 @@
+----+
@Inject
- private ProductDAO _dao;
+ private ProductDAO dao;
- private Product _product;
+ private Product product;
- private long _productId;
+ private long productId;
- public void setProductId(long productId) { _productId = productId; }
+ public void setProductId(long productId) { productId = productId; }
void onActivate(long productId)
{
- _productId = productId;
+ this.productId = productId;
- _product = _dao.getById(_productId);
+ product = dao.getById(productId);
}
- long onPassivate() { return _productId; }
+ long onPassivate() { return productId; }
+----+
This change ensures that the render request URL will include the product id, i.e., "http://.../productdetails/99".
@@ -277,20 +281,20 @@
+----+
@Inject
- private ProductDAO _dao;
+ private ProductDAO dao;
- private Product _product;
+ private Product product;
- private long _productId;
+ private long productId;
void onActivate(long productId)
{
- _productId = productId;
+ this.productId = productId;
- _product = _dao.getById(_productId);
+ product = dao.getById(productId);
}
- long onPassivate() { return _productId; }
+ long onPassivate() { return productId; }
+----+
The setProductId() method is no longer needed.
Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/parameters.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/parameters.apt?rev=654547&r1=654546&r2=654547&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/parameters.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/parameters.apt Thu May 8 08:19:05 2008
@@ -33,41 +33,41 @@
private int _start = 1;
@Parameter(required = true)
- private int _end;
+ private int end;
@Parameter
- private int _value;
+ private int value;
- private boolean _increment;
+ private boolean increment;
@SetupRender
void initializeValue()
{
- _value = _start;
+ value = start;
- _increment = _start < _end;
+ increment = start < end;
}
@AfterRender
boolean next()
{
- if (_increment)
+ if (increment)
{
- int newValue = _value + 1;
+ int newValue = value + 1;
- if (newValue <= _end)
+ if (newValue <= end)
{
- _value = newValue;
+ value = newValue;
return false;
}
}
else
{
- int newValue = _value - 1;
+ int newValue = value - 1;
- if (newValue >= _end)
+ if (newValue >= end)
{
- _value = newValue;
+ value = newValue;
return false;
}
}
@@ -152,12 +152,13 @@
<ul>
<li t:type="loop" source="1..10" value="index">${index}</li>
</ul>
+---
- private int _index;
-
- public int getIndex() { return _index; }
+ And in the Java code:
- public void setIndex(int index) { _index = index; }
+---
+ @Property
+ private int index;
---
... could be rewritten as just:
@@ -168,7 +169,7 @@
</ul>
---
- In other words, you don't have to define a property in the Java code. This disadvantage is that
+ In other words, you don't have to define a property in the Java code. The disadvantage is that
render variables don't work with the property expression syntax, so you can pass around a
render variables <value> but you can't reference any of the value's properties.
@@ -350,10 +351,10 @@
+----+
@Parameter("defaultMessage")
- private String _message;
+ private String message;
@Parameter(required=true)
- private int _maxLength;
+ private int maxLength;
public String getDefaultMessage()
{
@@ -377,25 +378,25 @@
+----+
@Parameter
- private String _message;
+ private String message;
@Parameter(required=true)
- private int _maxLength;
+ private int maxLength;
@Inject
- private ComponentResources _resources;
+ private ComponentResources resources;
@Inject
- private BindingSource _bindingSource;
+ private BindingSource bindingSource;
Binding defaultMessage()
{
- return _bindingSource.newBinding("default value", _resources, "defaultMessage");
+ return bindingSource.newBinding("default value", resources, "defaultMessage");
}
public String getDefaultMessage()
{
- return String.format("Maximum field length is %d.", _maxLength);
+ return String.format("Maximum field length is %d.", maxLength);
}
+---+
@@ -405,13 +406,13 @@
+----+
@Parameter
- private String _message;
+ private String message;
@Parameter(required=true)
- private int _maxLength;
+ private int maxLength;
@Inject
- private ComponentResources _resources;
+ private ComponentResources resources;
String defaultMessage()
{
@@ -474,15 +475,15 @@
public class MyComponent
{
@Parameter
- private int _myParam;
+ private int myParam;
@Inject
- private ComponentResources _resources;
+ private ComponentResources resources;
@BeginRender
void setup()
{
- if (_resources.isBound("myParam"))
+ if (resources.isBound("myParam"))
{
. . .
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/persist.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/persist.apt?rev=654547&r1=654546&r2=654547&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/persist.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/persist.apt Thu May 8 08:19:05 2008
@@ -19,7 +19,7 @@
+----+
@Persist
- private int _value;
+ private int value;
+----+
Annotated fields will store their state between requests. Generally, speaking, this means
Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/rendering.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/rendering.apt?rev=654547&r1=654546&r2=654547&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/rendering.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/rendering.apt Thu May 8 08:19:05 2008
@@ -72,44 +72,44 @@
public class Count
{
@Parameter
- private int _start = 1;
+ private int start = 1;
@Parameter(required = true)
- private int _end;
+ private int end;
@Parameter
- private int _value;
+ private int value;
- private boolean _increment;
+ private boolean increment;
@SetupRender
void initializeValue()
{
- _value = _start;
+ value = start;
- _increment = _start < _end;
+ increment = start < end;
}
@AfterRender
boolean next()
{
- if (_increment)
+ if (increment)
{
- int newValue = _value + 1;
+ int newValue = value + 1;
- if (newValue <= _end)
+ if (newValue <= end)
{
- _value = newValue;
+ value = newValue;
return false;
}
}
else
{
- int newValue = _value - 1;
+ int newValue = value - 1;
- if (newValue >= _end)
+ if (newValue >= end)
{
- _value = newValue;
+ value = newValue;
return false;
}
}
@@ -209,42 +209,42 @@
public class Count
{
@Parameter
- private int _start = 1;
+ private int start = 1;
@Parameter(required = true)
- private int _end;
+ private int end;
@Parameter
- private int _value;
+ private int value;
- private boolean _increment;
+ private boolean increment;
void setupRender()
{
- _value = _start;
+ value = start;
- _increment = _start < _end;
+ increment = start < end;
}
boolean afterRender()
{
- if (_increment)
+ if (increment)
{
- int newValue = _value + 1;
+ int newValue = value + 1;
- if (newValue <= _end)
+ if (newValue <= end)
{
- _value = newValue;
+ value = newValue;
return false;
}
}
else
{
- int newValue = _value - 1;
+ int newValue = value - 1;
- if (newValue >= _end)
+ if (newValue >= end)
{
- _value = newValue;
+ value = newValue;
return false;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/validation.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/validation.apt?rev=654547&r1=654546&r2=654547&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/validation.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/validation.apt Thu May 8 08:19:05 2008
@@ -86,24 +86,24 @@
public class Login
{
@Persist
- private String _userName;
+ private String userName;
- private String _password;
+ private String password;
@Inject
- private UserAuthenticator _authenticator;
+ private UserAuthenticator authenticator;
@Component(id = "password")
- private PasswordField _passwordField;
+ private PasswordField passwordField;
@Component
- private Form _form;
+ private Form form;
String onSuccess()
{
- if (!_authenticator.isValid(_userName, _password))
+ if (!authenticator.isValid(userName, password))
{
- _form.recordError(_passwordField, "Invalid user name or password.");
+ form.recordError(passwordField, "Invalid user name or password.");
return null;
}
@@ -112,22 +112,22 @@
public String getPassword()
{
- return _password;
+ return password;
}
public void setPassword(String password)
{
- _password = password;
+ password = password;
}
public String getUserName()
{
- return _userName;
+ return userName;
}
public void setUserName(String userName)
{
- _userName = userName;
+ userName = userName;
}
}
+---+
@@ -263,11 +263,11 @@
. . .
- private int _quantity;
+ private int quantity;
String onToClientFromQuantity()
{
- if (_quantity == 0) return "";
+ if (quantity == 0) return "";
return null;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/index.apt?rev=654547&r1=654546&r2=654547&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/index.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/index.apt Thu May 8 08:19:05 2008
@@ -118,22 +118,22 @@
{
@Persist
@Property
- private String _userId;
+ private String userId;
@Property
- private String _password;
+ private String password;
@Component
- private Form _form;
+ private Form form;
@Inject
- private LoginAuthenticator _authenticator;
+ private LoginAuthenticator authenticator;
void onValidateForm()
{
- if (! _authenticator.isValidLogin(_userId, _password))
+ if (! authenticator.isValidLogin(userId, password))
{
- _form.recordError("Invalid user name or password.");
+ form.recordError("Invalid user name or password.");
}
}
Re: svn commit: r654547 - in /tapestry/tapestry5/trunk/tapestry-core/src: main/java/org/apache/tapestry/test/ main/java/org/apache/tapestry/util/ main/java/org/apache/tapestry/validator/ site/apt/ site/apt/guide/
Posted by Andreas Andreou <an...@gmail.com>.
perhaps he was too attached to the underscores :P
On Thu, May 8, 2008 at 9:09 PM, Howard Lewis Ship <hl...@gmail.com> wrote:
> That doesn't appear to be so; they go to commits@tapestry.apache.org.
> I seem them only there.
>
> On Thu, May 8, 2008 at 10:57 AM, Filip S. Adamsen <fs...@fsadev.com> wrote:
>> Because the commit messages are sent to the developer's list.
>>
>> -Filip
>>
>>
>>
>> On 2008-05-08 18:12, Christian Edward Gruber wrote:
>>
>> > Why would you unsubscribe to a commit message list, but send the
>> usubscribe message to the developer's list?
>> >
>> > Christian.
>> > On 8-May-08, at 11:35 , Haldini wrote:
>> >
>> >
>> > > unsubscribe
>> > >
>> > > 2008/5/9 <hl...@apache.org>:
>> > >
>> > > > Author: hlship
>> > > > Date: Thu May 8 08:19:05 2008
>> > > > New Revision: 654547
>> > > >
>> > > > URL: http://svn.apache.org/viewvc?rev=654547&view=rev
>> > > > Log:
>> > > > Remove leading underscores from field names
>> > > >
>> > > > [snip]
>> > > >
>> > >
>> > > ---------------------------------------------------------------------
>> > > To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
>> > > For additional commands, e-mail: dev-help@tapestry.apache.org
>> > >
>> > >
>> >
>> >
>> > ---------------------------------------------------------------------
>> > To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
>> > For additional commands, e-mail: dev-help@tapestry.apache.org
>> >
>> >
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
>> For additional commands, e-mail: dev-help@tapestry.apache.org
>>
>>
>
>
>
> --
> Howard M. Lewis Ship
>
> Creator Apache Tapestry and Apache HiveMind
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
> For additional commands, e-mail: dev-help@tapestry.apache.org
>
>
--
Andreas Andreou - andyhot@apache.org - http://blog.andyhot.gr
Tapestry / Tacos developer
Open Source / JEE Consulting
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
For additional commands, e-mail: dev-help@tapestry.apache.org
Re: svn commit: r654547 - in /tapestry/tapestry5/trunk/tapestry-core/src:
main/java/org/apache/tapestry/test/ main/java/org/apache/tapestry/util/ main/java/org/apache/tapestry/validator/
site/apt/ site/apt/guide/
Posted by "Filip S. Adamsen" <fs...@fsadev.com>.
Well, I guess I'm wrong then. :)
Anyhow, to unsubscribe from commits, send a mail to
commits-unsubscribe@tapestry.apache.org.
http://tapestry.apache.org/mail-lists.html
-Filip
On 2008-05-08 23:03, Christian Edward Gruber wrote:
> Yeah, I'm only seeing them on commits@.
>
> Christian.
> On 8-May-08, at 14:09 , Howard Lewis Ship wrote:
>
>> That doesn't appear to be so; they go to commits@tapestry.apache.org.
>> I seem them only there.
>>
>> On Thu, May 8, 2008 at 10:57 AM, Filip S. Adamsen <fs...@fsadev.com> wrote:
>>> Because the commit messages are sent to the developer's list.
>>>
>>> -Filip
>>>
>>>
>>>
>>> On 2008-05-08 18:12, Christian Edward Gruber wrote:
>>>
>>>> Why would you unsubscribe to a commit message list, but send the
>>> usubscribe message to the developer's list?
>>>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
> For additional commands, e-mail: dev-help@tapestry.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
For additional commands, e-mail: dev-help@tapestry.apache.org
Re: svn commit: r654547 - in /tapestry/tapestry5/trunk/tapestry-core/src: main/java/org/apache/tapestry/test/ main/java/org/apache/tapestry/util/ main/java/org/apache/tapestry/validator/ site/apt/ site/apt/guide/
Posted by Christian Edward Gruber <ch...@gmail.com>.
Yeah, I'm only seeing them on commits@.
Christian.
On 8-May-08, at 14:09 , Howard Lewis Ship wrote:
> That doesn't appear to be so; they go to commits@tapestry.apache.org.
> I seem them only there.
>
> On Thu, May 8, 2008 at 10:57 AM, Filip S. Adamsen <fs...@fsadev.com>
> wrote:
>> Because the commit messages are sent to the developer's list.
>>
>> -Filip
>>
>>
>>
>> On 2008-05-08 18:12, Christian Edward Gruber wrote:
>>
>>> Why would you unsubscribe to a commit message list, but send the
>> usubscribe message to the developer's list?
>>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
For additional commands, e-mail: dev-help@tapestry.apache.org
Re: svn commit: r654547 - in /tapestry/tapestry5/trunk/tapestry-core/src: main/java/org/apache/tapestry/test/ main/java/org/apache/tapestry/util/ main/java/org/apache/tapestry/validator/ site/apt/ site/apt/guide/
Posted by Howard Lewis Ship <hl...@gmail.com>.
That doesn't appear to be so; they go to commits@tapestry.apache.org.
I seem them only there.
On Thu, May 8, 2008 at 10:57 AM, Filip S. Adamsen <fs...@fsadev.com> wrote:
> Because the commit messages are sent to the developer's list.
>
> -Filip
>
>
>
> On 2008-05-08 18:12, Christian Edward Gruber wrote:
>
> > Why would you unsubscribe to a commit message list, but send the
> usubscribe message to the developer's list?
> >
> > Christian.
> > On 8-May-08, at 11:35 , Haldini wrote:
> >
> >
> > > unsubscribe
> > >
> > > 2008/5/9 <hl...@apache.org>:
> > >
> > > > Author: hlship
> > > > Date: Thu May 8 08:19:05 2008
> > > > New Revision: 654547
> > > >
> > > > URL: http://svn.apache.org/viewvc?rev=654547&view=rev
> > > > Log:
> > > > Remove leading underscores from field names
> > > >
> > > > [snip]
> > > >
> > >
> > > ---------------------------------------------------------------------
> > > To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
> > > For additional commands, e-mail: dev-help@tapestry.apache.org
> > >
> > >
> >
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
> > For additional commands, e-mail: dev-help@tapestry.apache.org
> >
> >
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
> For additional commands, e-mail: dev-help@tapestry.apache.org
>
>
--
Howard M. Lewis Ship
Creator Apache Tapestry and Apache HiveMind
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
For additional commands, e-mail: dev-help@tapestry.apache.org
Re: svn commit: r654547 - in /tapestry/tapestry5/trunk/tapestry-core/src:
main/java/org/apache/tapestry/test/ main/java/org/apache/tapestry/util/ main/java/org/apache/tapestry/validator/
site/apt/ site/apt/guide/
Posted by "Filip S. Adamsen" <fs...@fsadev.com>.
Because the commit messages are sent to the developer's list.
-Filip
On 2008-05-08 18:12, Christian Edward Gruber wrote:
> Why would you unsubscribe to a commit message list, but send the
> usubscribe message to the developer's list?
>
> Christian.
> On 8-May-08, at 11:35 , Haldini wrote:
>
>> unsubscribe
>>
>> 2008/5/9 <hl...@apache.org>:
>>> Author: hlship
>>> Date: Thu May 8 08:19:05 2008
>>> New Revision: 654547
>>>
>>> URL: http://svn.apache.org/viewvc?rev=654547&view=rev
>>> Log:
>>> Remove leading underscores from field names
>>>
>>> [snip]
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
>> For additional commands, e-mail: dev-help@tapestry.apache.org
>>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
> For additional commands, e-mail: dev-help@tapestry.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
For additional commands, e-mail: dev-help@tapestry.apache.org
Re: svn commit: r654547 - in /tapestry/tapestry5/trunk/tapestry-core/src: main/java/org/apache/tapestry/test/ main/java/org/apache/tapestry/util/ main/java/org/apache/tapestry/validator/ site/apt/ site/apt/guide/
Posted by Christian Edward Gruber <ch...@gmail.com>.
Why would you unsubscribe to a commit message list, but send the
usubscribe message to the developer's list?
Christian.
On 8-May-08, at 11:35 , Haldini wrote:
> unsubscribe
>
> 2008/5/9 <hl...@apache.org>:
>> Author: hlship
>> Date: Thu May 8 08:19:05 2008
>> New Revision: 654547
>>
>> URL: http://svn.apache.org/viewvc?rev=654547&view=rev
>> Log:
>> Remove leading underscores from field names
>>
>> [snip]
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
> For additional commands, e-mail: dev-help@tapestry.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
For additional commands, e-mail: dev-help@tapestry.apache.org
Re: svn commit: r654547 - in /tapestry/tapestry5/trunk/tapestry-core/src: main/java/org/apache/tapestry/test/ main/java/org/apache/tapestry/util/ main/java/org/apache/tapestry/validator/ site/apt/ site/apt/guide/
Posted by Haldini <ha...@gmail.com>.
unsubscribe
2008/5/9 <hl...@apache.org>:
> Author: hlship
> Date: Thu May 8 08:19:05 2008
> New Revision: 654547
>
> URL: http://svn.apache.org/viewvc?rev=654547&view=rev
> Log:
> Remove leading underscores from field names
>
> Modified:
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/test/PageTester.java
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/DefaultPrimaryKeyEncoder.java
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/EnumSelectModel.java
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/EnumValueEncoder.java
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/StringToEnumCoercion.java
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/TextStreamResponse.java
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/validator/AbstractValidator.java
> tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/ajax.apt
> tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/appstate.apt
> tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/assets.apt
> tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/beaneditform.apt
> tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/coercion.apt
> tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/component-classes.apt
> tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/env.apt
> tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/event.apt
> tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/inject.apt
> tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/localization.apt
> tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/logging.apt
> tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/mixins.apt
> tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/pagenav.apt
> tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/parameters.apt
> tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/persist.apt
> tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/rendering.apt
> tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/validation.apt
> tapestry/tapestry5/trunk/tapestry-core/src/site/apt/index.apt
>
> Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/test/PageTester.java
> URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/test/PageTester.java?rev=654547&r1=654546&r2=654547&view=diff
> ==============================================================================
> --- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/test/PageTester.java (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/test/PageTester.java Thu May 8 08:19:05 2008
> @@ -41,17 +41,17 @@
> */
> public class PageTester implements ComponentInvoker
> {
> - private final Registry _registry;
> + private final Registry registry;
>
> - private final ComponentInvocationMap _invocationMap;
> + private final ComponentInvocationMap invocationMap;
>
> - private final TestableRequest _request;
> + private final TestableRequest request;
>
> - private final StrategyRegistry<ComponentInvoker> _invokerRegistry;
> + private final StrategyRegistry<ComponentInvoker> invokerRegistry;
>
> - private Locale _preferedLanguage;
> + private Locale preferedLanguage;
>
> - private final LocalizationSetter _localizationSetter;
> + private final LocalizationSetter localizationSetter;
>
> public static final String DEFAULT_CONTEXT_PATH = "src/main/webapp";
>
> @@ -81,7 +81,7 @@
> */
> public PageTester(String appPackage, String appName, String contextPath, Class... moduleClasses)
> {
> - _preferedLanguage = Locale.ENGLISH;
> + preferedLanguage = Locale.ENGLISH;
>
> SymbolProvider provider = new SingleKeySymbolProvider(InternalConstants.TAPESTRY_APP_PACKAGE_PARAM, appPackage);
>
> @@ -91,23 +91,23 @@
> initializer.addModules(moduleClasses);
> initializer.addModules(provideExtraModuleDefs());
>
> - _registry = initializer.getRegistry();
> + registry = initializer.getRegistry();
>
> - _request = _registry.getObject(TestableRequest.class, null);
> + request = registry.getObject(TestableRequest.class, null);
>
> - _localizationSetter = _registry.getService("LocalizationSetter", LocalizationSetter.class);
> + localizationSetter = registry.getService("LocalizationSetter", LocalizationSetter.class);
>
> - _invocationMap = _registry.getObject(ComponentInvocationMap.class, null);
> + invocationMap = registry.getObject(ComponentInvocationMap.class, null);
>
> - ApplicationGlobals globals = _registry.getObject(ApplicationGlobals.class, null);
> + ApplicationGlobals globals = registry.getObject(ApplicationGlobals.class, null);
>
> globals.storeContext(new PageTesterContext(contextPath));
>
> Map<Class, ComponentInvoker> map = newMap();
> - map.put(PageLinkTarget.class, new PageLinkInvoker(_registry));
> - map.put(ActionLinkTarget.class, new ActionLinkInvoker(_registry, this, _invocationMap));
> + map.put(PageLinkTarget.class, new PageLinkInvoker(registry));
> + map.put(ActionLinkTarget.class, new ActionLinkInvoker(registry, this, invocationMap));
>
> - _invokerRegistry = StrategyRegistry.newInstance(ComponentInvoker.class, map);
> + invokerRegistry = StrategyRegistry.newInstance(ComponentInvoker.class, map);
> }
>
> /**
> @@ -125,7 +125,7 @@
> */
> public void shutdown()
> {
> - _registry.shutdown();
> + registry.shutdown();
> }
>
>
> @@ -134,7 +134,7 @@
> */
> public Registry getRegistry()
> {
> - return _registry;
> + return registry;
> }
>
> /**
> @@ -145,7 +145,7 @@
> */
> public <T> T getService(Class<T> serviceInterface)
> {
> - return _registry.getService(serviceInterface);
> + return registry.getService(serviceInterface);
> }
>
> /**
> @@ -176,7 +176,7 @@
>
> private ComponentInvocation getInvocation(Element element)
> {
> - ComponentInvocation invocation = _invocationMap.get(element);
> + ComponentInvocation invocation = invocationMap.get(element);
>
> if (invocation == null)
> throw new IllegalArgumentException("No component invocation object is associated with the Element.");
> @@ -188,18 +188,18 @@
> {
> // It is critical to clear the map before invoking an invocation (render a page or click a
> // link).
> - _invocationMap.clear();
> + invocationMap.clear();
>
> setThreadLocale();
>
> - ComponentInvoker invoker = _invokerRegistry.getByInstance(invocation.getTarget());
> + ComponentInvoker invoker = invokerRegistry.getByInstance(invocation.getTarget());
>
> return invoker.invoke(invocation);
> }
>
> private void setThreadLocale()
> {
> - _localizationSetter.setThreadLocale(_preferedLanguage);
> + localizationSetter.setThreadLocale(preferedLanguage);
> }
>
> /**
> @@ -213,9 +213,9 @@
> {
> notNull(form, "form");
>
> - _request.clear();
> + request.clear();
>
> - _request.loadParameters(parameters);
> + request.loadParameters(parameters);
>
> addHiddenFormFields(form);
>
> @@ -275,7 +275,7 @@
> private void addHiddenFormFields(Element element)
> {
> if (isHiddenFormField(element))
> - _request.loadParameter(element.getAttribute("name"), element.getAttribute("value"));
> + request.loadParameter(element.getAttribute("name"), element.getAttribute("value"));
>
> for (Node child : element.getChildren())
> {
> @@ -293,6 +293,6 @@
>
> public void setPreferedLanguage(Locale preferedLanguage)
> {
> - _preferedLanguage = preferedLanguage;
> + this.preferedLanguage = preferedLanguage;
> }
> }
>
> Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/DefaultPrimaryKeyEncoder.java
> URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/DefaultPrimaryKeyEncoder.java?rev=654547&r1=654546&r2=654547&view=diff
> ==============================================================================
> --- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/DefaultPrimaryKeyEncoder.java (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/DefaultPrimaryKeyEncoder.java Thu May 8 08:19:05 2008
> @@ -15,7 +15,7 @@
> package org.apache.tapestry.util;
>
> import org.apache.tapestry.PrimaryKeyEncoder;
> -import static org.apache.tapestry.ioc.internal.util.CollectionFactory.*;
> +import org.apache.tapestry.ioc.internal.util.CollectionFactory;
> import org.apache.tapestry.ioc.internal.util.Defense;
>
> import java.io.Serializable;
> @@ -35,13 +35,13 @@
> */
> public class DefaultPrimaryKeyEncoder<K extends Serializable, V> implements PrimaryKeyEncoder<K, V>
> {
> - private final Map<K, V> _keyToValue = new LinkedHashMap<K, V>();
> + private final Map<K, V> keyToValue = new LinkedHashMap<K, V>();
>
> - private final Map<V, K> _valueToKey = newMap();
> + private final Map<V, K> valueToKey = CollectionFactory.newMap();
>
> - private Set<K> _deletedKeys;
> + private Set<K> deletedKeys;
>
> - private K _currentKey;
> + private K currentKey;
>
> /**
> * Adds a new key/value pair to the encoder.
> @@ -51,14 +51,14 @@
> Defense.notNull(key, "key");
> Defense.notNull(value, "value");
>
> - V existing = _keyToValue.get(key);
> + V existing = keyToValue.get(key);
> if (existing != null) throw new IllegalArgumentException(UtilMessages.duplicateKey(key, value, existing));
>
> - _keyToValue.put(key, value);
> + keyToValue.put(key, value);
>
> // TODO: Ensure that the value is unique?
>
> - _valueToKey.put(value, key);
> + valueToKey.put(value, key);
> }
>
> /**
> @@ -69,7 +69,7 @@
> */
> public final List<V> getValues()
> {
> - return valuesNotInKeySet(_deletedKeys);
> + return valuesNotInKeySet(deletedKeys);
> }
>
> /**
> @@ -83,9 +83,9 @@
> {
> if (keySet == null || keySet.isEmpty()) return getAllValues();
>
> - List<V> result = newList();
> + List<V> result = CollectionFactory.newList();
>
> - for (Map.Entry<K, V> entry : _keyToValue.entrySet())
> + for (Map.Entry<K, V> entry : keyToValue.entrySet())
> {
>
> if (keySet.contains(entry.getKey())) continue;
> @@ -98,9 +98,9 @@
>
> public final List<V> getAllValues()
> {
> - List<V> result = newList();
> + List<V> result = CollectionFactory.newList();
>
> - for (Map.Entry<K, V> entry : _keyToValue.entrySet())
> + for (Map.Entry<K, V> entry : keyToValue.entrySet())
> {
> result.add(entry.getValue());
> }
> @@ -116,27 +116,27 @@
> {
> Defense.notNull(value, "value");
>
> - _currentKey = _valueToKey.get(value);
> + currentKey = valueToKey.get(value);
>
> - if (_currentKey == null) throw new IllegalArgumentException(UtilMessages.missingValue(value, _valueToKey
> + if (currentKey == null) throw new IllegalArgumentException(UtilMessages.missingValue(value, valueToKey
> .keySet()));
>
> - return _currentKey;
> + return currentKey;
> }
>
> public final V toValue(K key)
> {
> - V result = _keyToValue.get(key);
> + V result = keyToValue.get(key);
>
> if (result == null)
> {
> result = provideMissingObject(key);
>
> - _currentKey = key;
> + currentKey = key;
> }
> else
> {
> - _currentKey = key;
> + currentKey = key;
> }
>
> return result;
> @@ -160,12 +160,12 @@
>
> public final boolean isDeleted()
> {
> - return inKeySet(_deletedKeys);
> + return inKeySet(deletedKeys);
> }
>
> public final void setDeleted(boolean value)
> {
> - _deletedKeys = modifyKeySet(_deletedKeys, value);
> + deletedKeys = modifyKeySet(deletedKeys, value);
> }
>
> /**
> @@ -176,7 +176,7 @@
> */
> protected final boolean inKeySet(Set<K> keySet)
> {
> - return keySet != null && keySet.contains(_currentKey);
> + return keySet != null && keySet.contains(currentKey);
> }
>
> /**
> @@ -196,11 +196,11 @@
> {
> if (!value) return null;
>
> - keySet = newSet();
> + keySet = CollectionFactory.newSet();
> }
>
> - if (value) keySet.add(_currentKey);
> - else keySet.remove(_currentKey);
> + if (value) keySet.add(currentKey);
> + else keySet.remove(currentKey);
>
> return keySet;
> }
>
> Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/EnumSelectModel.java
> URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/EnumSelectModel.java?rev=654547&r1=654546&r2=654547&view=diff
> ==============================================================================
> --- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/EnumSelectModel.java (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/EnumSelectModel.java Thu May 8 08:19:05 2008
> @@ -19,7 +19,7 @@
> import org.apache.tapestry.internal.OptionModelImpl;
> import org.apache.tapestry.internal.TapestryInternalUtils;
> import org.apache.tapestry.ioc.Messages;
> -import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
> +import org.apache.tapestry.ioc.internal.util.CollectionFactory;
> import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
>
> import java.io.Serializable;
> @@ -35,7 +35,7 @@
> {
> private static final long serialVersionUID = -3590412082766899684L;
>
> - private final List<OptionModel> _options = newList();
> + private final List<OptionModel> options = CollectionFactory.newList();
>
> public <T extends Enum> EnumSelectModel(Class<T> enumClass, Messages messages)
> {
> @@ -53,7 +53,7 @@
> {
> String label = TapestryInternalUtils.getLabelForEnum(messages, prefix, value);
>
> - _options.add(new OptionModelImpl(label, value));
> + options.add(new OptionModelImpl(label, value));
> }
> }
>
> @@ -70,7 +70,7 @@
> */
> public List<OptionModel> getOptions()
> {
> - return _options;
> + return options;
> }
>
> }
>
> Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/EnumValueEncoder.java
> URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/EnumValueEncoder.java?rev=654547&r1=654546&r2=654547&view=diff
> ==============================================================================
> --- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/EnumValueEncoder.java (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/EnumValueEncoder.java Thu May 8 08:19:05 2008
> @@ -23,13 +23,13 @@
> */
> public class EnumValueEncoder<E extends Enum<E>> implements ValueEncoder<E>
> {
> - private final Class<E> _enumType;
> + private final Class<E> enumType;
>
> public EnumValueEncoder(final Class<E> enumType)
> {
> notNull(enumType, "enumType");
>
> - _enumType = enumType;
> + this.enumType = enumType;
> }
>
> public String toClient(E value)
> @@ -44,7 +44,7 @@
> {
> if (InternalUtils.isBlank(clientValue)) return null;
>
> - return Enum.valueOf(_enumType, clientValue);
> + return Enum.valueOf(enumType, clientValue);
> }
>
> }
>
> Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/StringToEnumCoercion.java
> URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/StringToEnumCoercion.java?rev=654547&r1=654546&r2=654547&view=diff
> ==============================================================================
> --- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/StringToEnumCoercion.java (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/StringToEnumCoercion.java Thu May 8 08:19:05 2008
> @@ -14,7 +14,7 @@
>
> package org.apache.tapestry.util;
>
> -import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newCaseInsensitiveMap;
> +import org.apache.tapestry.ioc.internal.util.CollectionFactory;
> import org.apache.tapestry.ioc.internal.util.InternalUtils;
> import org.apache.tapestry.ioc.services.Coercion;
>
> @@ -29,9 +29,9 @@
> */
> public final class StringToEnumCoercion<T extends Enum> implements Coercion<String, T>
> {
> - private final Class<T> _enumClass;
> + private final Class<T> enumClass;
>
> - private final Map<String, T> _stringToEnum = newCaseInsensitiveMap();
> + private final Map<String, T> stringToEnum = CollectionFactory.newCaseInsensitiveMap();
>
> public StringToEnumCoercion(Class<T> enumClass)
> {
> @@ -40,10 +40,10 @@
>
> public StringToEnumCoercion(Class<T> enumClass, T... values)
> {
> - _enumClass = enumClass;
> + this.enumClass = enumClass;
>
> for (T value : values)
> - _stringToEnum.put(value.name(), value);
> + stringToEnum.put(value.name(), value);
> }
>
> public T coerce(String input)
> @@ -51,13 +51,13 @@
> if (InternalUtils.isBlank(input))
> return null;
>
> - T result = _stringToEnum.get(input);
> + T result = stringToEnum.get(input);
>
> if (result == null)
> throw new RuntimeException(UtilMessages.missingEnumValue(
> input,
> - _enumClass,
> - _stringToEnum.keySet()));
> + enumClass,
> + stringToEnum.keySet()));
>
> return result;
> }
>
> Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/TextStreamResponse.java
> URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/TextStreamResponse.java?rev=654547&r1=654546&r2=654547&view=diff
> ==============================================================================
> --- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/TextStreamResponse.java (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/TextStreamResponse.java Thu May 8 08:19:05 2008
> @@ -25,27 +25,25 @@
>
> public class TextStreamResponse implements StreamResponse
> {
> - private final String _contentType;
> + private final String contentType, text;
>
> - private final String _text;
> -
> - public TextStreamResponse(final String contentType, final String text)
> + public TextStreamResponse(String contentType, String text)
> {
> notBlank(contentType, "contentType");
> notNull(text, "text");
>
> - _contentType = contentType;
> - _text = text;
> + this.contentType = contentType;
> + this.text = text;
> }
>
> public String getContentType()
> {
> - return _contentType;
> + return contentType;
> }
>
> public InputStream getStream() throws IOException
> {
> - return new ByteArrayInputStream(_text.getBytes());
> + return new ByteArrayInputStream(text.getBytes());
> }
>
> public void prepareResponse(Response response)
>
> Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/validator/AbstractValidator.java
> URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/validator/AbstractValidator.java?rev=654547&r1=654546&r2=654547&view=diff
> ==============================================================================
> --- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/validator/AbstractValidator.java (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/validator/AbstractValidator.java Thu May 8 08:19:05 2008
> @@ -16,34 +16,37 @@
>
> import org.apache.tapestry.Validator;
>
> +/**
> + * Base class for constructing a {@link org.apache.tapestry.Validator}.
> + */
> public abstract class AbstractValidator<C, T> implements Validator<C, T>
> {
> - private final Class<C> _constraintType;
> + private final Class<C> constraintType;
>
> - private final Class<T> _valueType;
> + private final Class<T> valueType;
>
> - private final String _messageKey;
> + private final String messageKey;
>
> protected AbstractValidator(Class<C> constraintType, Class<T> valueType, String messageKey)
> {
> - _constraintType = constraintType;
> - _valueType = valueType;
> - _messageKey = messageKey;
> + this.constraintType = constraintType;
> + this.valueType = valueType;
> + this.messageKey = messageKey;
> }
>
> public final Class<C> getConstraintType()
> {
> - return _constraintType;
> + return constraintType;
> }
>
> public final Class<T> getValueType()
> {
> - return _valueType;
> + return valueType;
> }
>
> public String getMessageKey()
> {
> - return _messageKey;
> + return messageKey;
> }
>
> public boolean isRequired()
>
> Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/ajax.apt
> URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/ajax.apt?rev=654547&r1=654546&r2=654547&view=diff
> ==============================================================================
> --- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/ajax.apt (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/ajax.apt Thu May 8 08:19:05 2008
> @@ -73,14 +73,14 @@
> +---+
>
> @Inject @Path("${tapestry.scriptaculous}/dragdrop.js")
> - private Asset _dragDropLibrary;
> + private Asset dragDropLibrary;
>
> @Environmental
> - private PageRenderSupport _pageRenderSupport;
> + private PageRenderSupport pageRenderSupport;
>
> void setupRender()
> {
> - _pageRenderSupport.addScriptLink(_dragDropLibrary);
> + pageRenderSupport.addScriptLink(dragDropLibrary);
> }
>
> +---+
> @@ -115,7 +115,7 @@
>
> +---+
> @Environmental
> - private PageRenderSupport _pageRenderSupport;
> + private PageRenderSupport pageRenderSupport;
> +---+
>
> Environmental only works inside components and occasionally a service may want to
> @@ -124,7 +124,7 @@
>
> +---+
> @Inject
> - private PageRenderSupport _pageRenderSupport;
> + private PageRenderSupport pageRenderSupport;
> +----+
>
> ... or, in a service implementation constructor:
> @@ -191,7 +191,7 @@
> +---+
> List<String> onProvideCompletionsFromAccountName(String partial)
> {
> - List<Account> matches = _accountDAO.findByPartialAccountName(partial);
> + List<Account> matches = accountDAO.findByPartialAccountName(partial);
>
> List<String> result = new ArrayList<String>():
>
>
> Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/appstate.apt
> URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/appstate.apt?rev=654547&r1=654546&r2=654547&view=diff
> ==============================================================================
> --- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/appstate.apt (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/appstate.apt Thu May 8 08:19:05 2008
> @@ -22,7 +22,7 @@
> public class MyPage
> {
> @ApplicationState
> - private MyState _myState;
> + private MyState myState;
>
> . . .
> }
> @@ -51,7 +51,7 @@
> Instead, create a second field:
>
> +---+
> - private boolean _myStateExists;
> + private boolean myStateExists;
> +---+
>
> This companion field is used to see if the ASO already exists. It is not annotated; it is located by name ("Exists" is appended to the name of the field
> @@ -61,10 +61,10 @@
>
> +---+
> @ApplicationState(create=false)
> - private MyState _myState;
> + private MyState myState;
> +---+
>
> - In this case, the _myState field will be null if the MyState ASO does not exist, but will be non-null if it has been
> + In this case, the myState field will be null if the MyState ASO does not exist, but will be non-null if it has been
> created (either by assigning a value to the field, or by a different ASO field where create is true).
>
> Persistence Strategies
>
> Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/assets.apt
> URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/assets.apt?rev=654547&r1=654546&r2=654547&view=diff
> ==============================================================================
> --- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/assets.apt (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/assets.apt Thu May 8 08:19:05 2008
> @@ -24,7 +24,7 @@
> +----+
> @Inject
> @Path("context:images/tapestry_banner.gif")
> - private Asset _banner;
> + private Asset banner;
> +----+
>
> Assets are located within <domains>; these domains are identified by the prefix on the Inject annotation's value.
> @@ -45,7 +45,7 @@
> +----+
> @Inject
> @Path("../edit.png")
> - private Asset _icon;
> + private Asset icon;
> +----+
>
> Since you must omit the prefix, this only makes sense for components packaged in a library for reuse.
> @@ -59,7 +59,7 @@
> +----+
> @Inject
> @Path("${skin.root}/style.css")
> - private Asset _style;
> + private Asset style;
> +----+
>
> An override of the skin.root symbol would affect all references to the named asset.
>
> Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/beaneditform.apt
> URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/beaneditform.apt?rev=654547&r1=654546&r2=654547&view=diff
> ==============================================================================
> --- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/beaneditform.apt (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/beaneditform.apt Thu May 8 08:19:05 2008
> @@ -122,34 +122,31 @@
> are insufficient. For example, if the the type of the property being edited is an interface type, it may be useful to provide
> an explicit BeanModel around an underlying implementation class.
>
> - The model can be created when the page is first loaded:
> + The model can be created when the page is first instantiated:
>
> +---+
> public class MyPage
> {
> @Inject
> - private BeanModelSource _beanModelSource;
> + private BeanModelSource beanModelSource;
>
> @Inject
> - private ComponentResources _resources;
> + private ComponentResources resources;
>
> @Retain
> - private BeanModel _model;
> + private BeanModel model;
>
> - private MyBean _bean;
> + @Property
> + private MyBean bean;
>
> - void pageLoaded()
> {
> - _model = _beanModelSource.create(MyBean.class, true, _resources);
> + model = beanModelSource.create(MyBean.class, true, resources);
>
> - // Make other changes to _model here.
> + // Make other changes to model here.
> }
>
> - public MyBean getBean() { return _bean; }
> -
> - public void setBean(MyBean bean) { _bean = bean; }
> -
> - public BeanModel getModel() { return _model; }
> +
> + public BeanModel getModel() { return model; }
> }
> +---+
>
> @@ -187,19 +184,19 @@
> public class AppPropertyEditBlocks
> {
> @Environmental
> - private PropertyEditContext _context;
> + private PropertyEditContext context;
>
> @Component(parameters =
> { "value=context.propertyValue", "label=prop:context.label",
> "translate=prop:currencyTranslator", "validate=prop:currencyValidator",
> "clientId=prop:context.propertyId" })
> - private TextField _currency;
> + private TextField currency;
>
> public PropertyEditContext getContext() { return _context; }
>
> public FieldValidator getCurrencyValidator()
> {
> - return _context.getValidator(_currency);
> + return context.getValidator(_currency);
> }
>
> public Translator getCurrencyTranslator()
>
> Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/coercion.apt
> URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/coercion.apt?rev=654547&r1=654546&r2=654547&view=diff
> ==============================================================================
> --- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/coercion.apt (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/coercion.apt Thu May 8 08:19:05 2008
> @@ -15,13 +15,13 @@
> public class Count
> {
> @Parameter
> - private int _start = 1;
> + private int start = 1;
>
> @Parameter(required = true)
> - private int _end;
> + private int end;
>
> @Parameter
> - private int _value;
> + private int value;
>
> . . .
> +---+
>
> Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/component-classes.apt
> URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/component-classes.apt?rev=654547&r1=654546&r2=654547&view=diff
> ==============================================================================
> --- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/component-classes.apt (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/component-classes.apt Thu May 8 08:19:05 2008
> @@ -137,7 +137,8 @@
> will log an error for each component class that contains fields that are neither static nor private.
>
> Be aware that you will need to provide getter and setter methods to access your classes'
> - instance variables. Tapestry <does not> do this automatically.
> + instance variables. Tapestry <does not> do this automatically unless you provide
> + the {{{../../apidocs/org/apache/tapestry/annotations/Property.html}Property}} annotation on the field.
>
>
> Transient Instance Variables
> @@ -195,26 +196,18 @@
> package org.example.app.pages;
>
> import org.apache.tapestry.annotations.Component;
> +import org.apache.tapestry.annotations.Property;
> import org.example.app.components.Count;
>
> public class Countdown
> {
> @Component(parameters =
> { "start=5", "end=1", "value=countValue" })
> - private Count _count;
> -
> - private int _countValue;
> + private Count count;
>
> - public int getCountValue()
> - {
> - return _countValue;
> - }
> -
> - public void setCountValue(int countValue)
> - {
> - _countValue = countValue;
> - }
> -}
> + @Property
> + private int countValue;
> +}
> +---+
>
> The above defines a component whose embedded id is "count" (this id is derived from the name of the field). The type
> @@ -222,11 +215,8 @@
> The start and end parameters of the Count component are bound to literal values, and the value
> parameter of the Count component is bound to the countValue property of the Countdown component.
>
> - Note that inside the component class, the default binding prefix is always "prop:".
> - In the example we could write <<<"value=prop:countValue">>> if we desired to be
> - fully explicit.
> -
> - However, certain literal values, such as the numeric literals in the example,
> + Technically, the start and end parameters should be bound to properties, just the the value parameter. However,
> + certain literal values, such as the numeric literals in the example,
> are accepted by the prop: binding prefix even though they are not actually properties (this is largely as a convienience
> to the application developer). We could also use the "literal:" prefix, <<<"start=literal:5">>> which accomplishes
> largely the same thing.
>
> Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/env.apt
> URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/env.apt?rev=654547&r1=654546&r2=654547&view=diff
> ==============================================================================
> --- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/env.apt (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/env.apt Thu May 8 08:19:05 2008
> @@ -34,14 +34,14 @@
> +---+
>
> @Inject @Path("${tapestry.scriptaculous}/dragdrop.js")
> - private Asset _dragDropLibrary;
> + private Asset dragDropLibrary;
>
> @Environmental
> - private PageRenderSupport _pageRenderSupport;
> + private PageRenderSupport pageRenderSupport;
>
> void setupRender()
> {
> - _pageRenderSupport.addScriptLink(_dragDropLibrary);
> + pageRenderSupport.addScriptLink(_dragDropLibrary);
> }
>
> +---+
> @@ -70,23 +70,23 @@
> public class TabGroup
> {
> @Inject
> - private Environment _environment;
> + private Environment environment;
>
> void beginRender()
> {
> - _environment.push(TabModel.class, new TabModelImpl(...));
> + environment.push(TabModel.class, new TabModelImpl(...));
> }
>
> void afterRender()
> {
> - _environment.pop(TabModel.class);
> + environment.pop(TabModel.class);
> }
> }
>
> public class Tab
> {
> @Environmental
> - private TabModel _model;
> + private TabModel model;
>
> void beginRender(MarkupWriter writer)
> {
>
> Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/event.apt
> URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/event.apt?rev=654547&r1=654546&r2=654547&view=diff
> ==============================================================================
> --- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/event.apt (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/event.apt Thu May 8 08:19:05 2008
> @@ -76,7 +76,7 @@
> @OnEvent(component = "select")
> void valueChosen(int value)
> {
> - _value = value;
> + this.value = value;
> }
> +---+
>
> @@ -97,7 +97,7 @@
> @OnEvent(value = "action", component = "select")
> void valueChosen(int value)
> {
> - _value = value;
> + this.value = value;
> }
> +---+
>
> @@ -125,7 +125,7 @@
> +---+
> void onActionFromSelect(int value)
> {
> - _value = value;
> + this.value = value;
> }
> +---+
>
> @@ -205,7 +205,7 @@
> {
> try
> {
> - _dao.executeQuery();
> + dao.executeQuery();
> }
> catch (JDBCException ex)
> {
> @@ -219,7 +219,7 @@
> +---+
> void onActionFromRunQuery() throws JDBCException
> {
> - _dao.executeQuery();
> + dao.executeQuery();
> }
> +----+
>
> @@ -243,7 +243,7 @@
> ---
> Object onException(Throwable cause)
> {
> - _message = cause.getMessage();
> + message = cause.getMessage();
>
> return this;
> }
>
> Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/inject.apt
> URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/inject.apt?rev=654547&r1=654546&r2=654547&view=diff
> ==============================================================================
> --- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/inject.apt (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/inject.apt Thu May 8 08:19:05 2008
> @@ -43,16 +43,16 @@
>
> For field type {{{../../apidocs/org/apache/tapestry/Block.html}Block}}, the value of the Inject annotation is the
> id of the {{{templates.apt}\<block\> element}} within the component's template. Normally, the id of the block is determined from the field name
> - (by stripping out leading "_" and "$" characters). Where that is not appropriate, an
> + (after stripping out leading "_" and "$" characters). Where that is not appropriate, an
> {{{../../apidocs/org/apache/tapestry/annotations/Id.html}Id}} annotation can be supplied:
>
> +---+
> @Inject
> - private Block _foo;
> + private Block foo;
>
> @Inject
> @Id("bar")
> - private Block _barBlock;
> + private Block barBlock;
> +---+
>
> The first injection will inject the Block with id "foo" (as always, case is ignored). The second injection will inject the Block with id "bar".
> @@ -69,7 +69,7 @@
>
> +----+
> @Inject
> -private ComponentResources _resources;
> +private ComponentResources resources;
> +----+
>
> Tapestry uses the type of the field, ComponentResources, to determine what to inject into this field.
> @@ -104,8 +104,13 @@
> +----+
> @Inject
> @Service("Request")
> -private Request _request;
> +private Request request;
> +----+
> +
> + This is generally not necessary; you should always be able to identify the service to be injected just by type, not
> + by explicit id. Explicit ids have the disadvantage of not being refactoring-safe: this won't happen with the Request service,
> + but perhaps in your own ... if you rename the service interface and rename the service id to match, your existing
> + injections using the explicit service id will break.
>
> Default Injection
>
>
> Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/localization.apt
> URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/localization.apt?rev=654547&r1=654546&r2=654547&view=diff
> ==============================================================================
> --- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/localization.apt (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/localization.apt Thu May 8 08:19:05 2008
> @@ -95,7 +95,7 @@
>
> +----+
> @Inject
> - private Messages _messages;
> + private Messages messages;
> +----+
>
> You could then <<<get()>>> messages, or <<<format()>>> them:
> @@ -104,10 +104,10 @@
>
> public String getCartSummary()
> {
> - if (_items.isEmpty())
> - return _messages.get("no-items");
> + if (items.isEmpty())
> + return messages.get("no-items");
>
> - return _messages.format("item-summary", _items.size());
> + return messages.format("item-summary", _items.size());
> }
> +----+
>
>
> Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/logging.apt
> URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/logging.apt?rev=654547&r1=654546&r2=654547&view=diff
> ==============================================================================
> --- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/logging.apt (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/logging.apt Thu May 8 08:19:05 2008
> @@ -30,21 +30,21 @@
> public class MyPage
> {
> @Inject
> - private Logger _logger;
> + private Logger logger;
>
> . . .
> ---
>
> @Log annotation
>
> - You may mark a method with the {{{../../apidocs/org/apache/tapestry/annotations/Log.html}Log}} annotation.
> + You may mark any component method with the {{{../../apidocs/org/apache/tapestry/annotations/Log.html}Log}} annotation.
> Method entry, exit (and any thrown exceptions) will be logged at DEBUG level. This is very convienient for
> debugging, especially when placed on event handler methods.
>
>
> DEBUG Level
>
> - When a component's logger is configured at the DEBUG level, you will see added output when the class is first
> + When a component's logger is configured at the DEBUG level, you will also see added output when the class is first
> accessed identifying how Tapestry is modifying the bytecode of the class.
>
> Example:
> @@ -124,7 +124,7 @@
>
> TRACE Level
>
> - At the TRACE level <for pages> enables extremely verbose logging of every activity that drives the rendering of output, such as each component
> + Enabling the TRACE level <for pages> results in extremely verbose logging of every activity that drives the rendering of output, such as each component
> working its way through the {{{rendering.html}rendering stage machine}}. Example:
>
> ----
>
> Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/mixins.apt
> URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/mixins.apt?rev=654547&r1=654546&r2=654547&view=diff
> ==============================================================================
> --- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/mixins.apt (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/mixins.apt Thu May 8 08:19:05 2008
> @@ -64,7 +64,7 @@
> +----+
>
> @Component(parameters=. . .) @Mixins({"Autocomplete", "DefaultFromCookie"})
> - private TextField _userId;
> + private TextField userId;
> +----+
>
> This example defines a component of type TextField and mixes in the <hypothetical> Autocomplete
> @@ -81,7 +81,7 @@
> public class AutocompleteField extendes TextField
> {
> @Mixin
> - private Autocomplete _autocompleteMixin;
> + private Autocomplete autocompleteMixin;
>
> . . .
> }
> @@ -96,7 +96,7 @@
> public class AutocompleteField extendes TextField
> {
> @Mixin("Autocomplete")
> - private Object _autocompleteMixin;
> + private Object autocompleteMixin;
>
> . . .
> }
> @@ -120,7 +120,7 @@
>
> +-----+
> @Component(parameters={"Autocomplete.id=auto", . . . }) @Mixins("Autocomplete", "DefaultFromCookie"})
> - private TextField _userId;
> + private TextField userId;
> +-----+
>
>
>
> Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/pagenav.apt
> URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/pagenav.apt?rev=654547&r1=654546&r2=654547&view=diff
> ==============================================================================
> --- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/pagenav.apt (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/pagenav.apt Thu May 8 08:19:05 2008
> @@ -112,15 +112,19 @@
> +---+
> public class ProductDetail
> {
> - private Product _product;
> + private Product product;
>
> . . .
>
> - long onPassivate() { return _product.getId(); }
> + long onPassivate() { return product.getId(); }
> }
> +----+
>
> The activation context may consist of a series of values, in which case the return value of the method should be an array or a List.
> +
> + <<Note: If you are using the {{{../tapestry-hibernate/}tapestry-hibernate}} integration library and your passivate context
> + is a Hibernate entity, then you can just use the entity itself, not its id. Tapestry will automatically extract the entities' id into the URL,
> + and convert it back for the "activate" event handler method.>>
>
> * Page activation
>
> @@ -183,11 +187,11 @@
>
> +---+
> @InjectPage
> - private ProductDetails _details;
> + private ProductDetails details;
>
> Object onActionFromSelect(long productId)
> {
> - _details.setProductId(productId);
> + details.setProductId(productId);
>
> return _details;
> }
> @@ -197,18 +201,18 @@
>
> +----+
> @Inject
> - private ProductDAO _dao;
> + private ProductDAO dao;
>
> - private Product _product;
> + private Product product;
>
> @Persist
> - private long _productId;
> + private long productId;
>
> - public void setProductId(long productId) { _productId = productId; }
> + public void setProductId(long productId) { this.productId = productId; }
>
> void onActivate()
> {
> - _product = _dao.getById(_productId);
> + product = dao.getById(productId);
> }
> +----+
>
> @@ -234,22 +238,22 @@
>
> +----+
> @Inject
> - private ProductDAO _dao;
> + private ProductDAO dao;
>
> - private Product _product;
> + private Product product;
>
> - private long _productId;
> + private long productId;
>
> - public void setProductId(long productId) { _productId = productId; }
> + public void setProductId(long productId) { productId = productId; }
>
> void onActivate(long productId)
> {
> - _productId = productId;
> + this.productId = productId;
>
> - _product = _dao.getById(_productId);
> + product = dao.getById(productId);
> }
>
> - long onPassivate() { return _productId; }
> + long onPassivate() { return productId; }
> +----+
>
> This change ensures that the render request URL will include the product id, i.e., "http://.../productdetails/99".
> @@ -277,20 +281,20 @@
>
> +----+
> @Inject
> - private ProductDAO _dao;
> + private ProductDAO dao;
>
> - private Product _product;
> + private Product product;
>
> - private long _productId;
> + private long productId;
>
> void onActivate(long productId)
> {
> - _productId = productId;
> + this.productId = productId;
>
> - _product = _dao.getById(_productId);
> + product = dao.getById(productId);
> }
>
> - long onPassivate() { return _productId; }
> + long onPassivate() { return productId; }
> +----+
>
> The setProductId() method is no longer needed.
>
> Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/parameters.apt
> URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/parameters.apt?rev=654547&r1=654546&r2=654547&view=diff
> ==============================================================================
> --- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/parameters.apt (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/parameters.apt Thu May 8 08:19:05 2008
> @@ -33,41 +33,41 @@
> private int _start = 1;
>
> @Parameter(required = true)
> - private int _end;
> + private int end;
>
> @Parameter
> - private int _value;
> + private int value;
>
> - private boolean _increment;
> + private boolean increment;
>
> @SetupRender
> void initializeValue()
> {
> - _value = _start;
> + value = start;
>
> - _increment = _start < _end;
> + increment = start < end;
> }
>
> @AfterRender
> boolean next()
> {
> - if (_increment)
> + if (increment)
> {
> - int newValue = _value + 1;
> + int newValue = value + 1;
>
> - if (newValue <= _end)
> + if (newValue <= end)
> {
> - _value = newValue;
> + value = newValue;
> return false;
> }
> }
> else
> {
> - int newValue = _value - 1;
> + int newValue = value - 1;
>
> - if (newValue >= _end)
> + if (newValue >= end)
> {
> - _value = newValue;
> + value = newValue;
> return false;
> }
> }
> @@ -152,12 +152,13 @@
> <ul>
> <li t:type="loop" source="1..10" value="index">${index}</li>
> </ul>
> +---
>
> - private int _index;
> -
> - public int getIndex() { return _index; }
> + And in the Java code:
>
> - public void setIndex(int index) { _index = index; }
> +---
> + @Property
> + private int index;
> ---
>
> ... could be rewritten as just:
> @@ -168,7 +169,7 @@
> </ul>
> ---
>
> - In other words, you don't have to define a property in the Java code. This disadvantage is that
> + In other words, you don't have to define a property in the Java code. The disadvantage is that
> render variables don't work with the property expression syntax, so you can pass around a
> render variables <value> but you can't reference any of the value's properties.
>
> @@ -350,10 +351,10 @@
>
> +----+
> @Parameter("defaultMessage")
> - private String _message;
> + private String message;
>
> @Parameter(required=true)
> - private int _maxLength;
> + private int maxLength;
>
> public String getDefaultMessage()
> {
> @@ -377,25 +378,25 @@
>
> +----+
> @Parameter
> - private String _message;
> + private String message;
>
> @Parameter(required=true)
> - private int _maxLength;
> + private int maxLength;
>
> @Inject
> - private ComponentResources _resources;
> + private ComponentResources resources;
>
> @Inject
> - private BindingSource _bindingSource;
> + private BindingSource bindingSource;
>
> Binding defaultMessage()
> {
> - return _bindingSource.newBinding("default value", _resources, "defaultMessage");
> + return bindingSource.newBinding("default value", resources, "defaultMessage");
> }
>
> public String getDefaultMessage()
> {
> - return String.format("Maximum field length is %d.", _maxLength);
> + return String.format("Maximum field length is %d.", maxLength);
> }
> +---+
>
> @@ -405,13 +406,13 @@
>
> +----+
> @Parameter
> - private String _message;
> + private String message;
>
> @Parameter(required=true)
> - private int _maxLength;
> + private int maxLength;
>
> @Inject
> - private ComponentResources _resources;
> + private ComponentResources resources;
>
> String defaultMessage()
> {
> @@ -474,15 +475,15 @@
> public class MyComponent
> {
> @Parameter
> - private int _myParam;
> + private int myParam;
>
> @Inject
> - private ComponentResources _resources;
> + private ComponentResources resources;
>
> @BeginRender
> void setup()
> {
> - if (_resources.isBound("myParam"))
> + if (resources.isBound("myParam"))
> {
> . . .
> }
>
> Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/persist.apt
> URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/persist.apt?rev=654547&r1=654546&r2=654547&view=diff
> ==============================================================================
> --- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/persist.apt (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/persist.apt Thu May 8 08:19:05 2008
> @@ -19,7 +19,7 @@
>
> +----+
> @Persist
> - private int _value;
> + private int value;
> +----+
>
> Annotated fields will store their state between requests. Generally, speaking, this means
>
> Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/rendering.apt
> URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/rendering.apt?rev=654547&r1=654546&r2=654547&view=diff
> ==============================================================================
> --- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/rendering.apt (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/rendering.apt Thu May 8 08:19:05 2008
> @@ -72,44 +72,44 @@
> public class Count
> {
> @Parameter
> - private int _start = 1;
> + private int start = 1;
>
> @Parameter(required = true)
> - private int _end;
> + private int end;
>
> @Parameter
> - private int _value;
> + private int value;
>
> - private boolean _increment;
> + private boolean increment;
>
> @SetupRender
> void initializeValue()
> {
> - _value = _start;
> + value = start;
>
> - _increment = _start < _end;
> + increment = start < end;
> }
>
> @AfterRender
> boolean next()
> {
> - if (_increment)
> + if (increment)
> {
> - int newValue = _value + 1;
> + int newValue = value + 1;
>
> - if (newValue <= _end)
> + if (newValue <= end)
> {
> - _value = newValue;
> + value = newValue;
> return false;
> }
> }
> else
> {
> - int newValue = _value - 1;
> + int newValue = value - 1;
>
> - if (newValue >= _end)
> + if (newValue >= end)
> {
> - _value = newValue;
> + value = newValue;
> return false;
> }
> }
> @@ -209,42 +209,42 @@
> public class Count
> {
> @Parameter
> - private int _start = 1;
> + private int start = 1;
>
> @Parameter(required = true)
> - private int _end;
> + private int end;
>
> @Parameter
> - private int _value;
> + private int value;
>
> - private boolean _increment;
> + private boolean increment;
>
> void setupRender()
> {
> - _value = _start;
> + value = start;
>
> - _increment = _start < _end;
> + increment = start < end;
> }
>
> boolean afterRender()
> {
> - if (_increment)
> + if (increment)
> {
> - int newValue = _value + 1;
> + int newValue = value + 1;
>
> - if (newValue <= _end)
> + if (newValue <= end)
> {
> - _value = newValue;
> + value = newValue;
> return false;
> }
> }
> else
> {
> - int newValue = _value - 1;
> + int newValue = value - 1;
>
> - if (newValue >= _end)
> + if (newValue >= end)
> {
> - _value = newValue;
> + value = newValue;
> return false;
> }
> }
>
> Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/validation.apt
> URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/validation.apt?rev=654547&r1=654546&r2=654547&view=diff
> ==============================================================================
> --- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/validation.apt (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/validation.apt Thu May 8 08:19:05 2008
> @@ -86,24 +86,24 @@
> public class Login
> {
> @Persist
> - private String _userName;
> + private String userName;
>
> - private String _password;
> + private String password;
>
> @Inject
> - private UserAuthenticator _authenticator;
> + private UserAuthenticator authenticator;
>
> @Component(id = "password")
> - private PasswordField _passwordField;
> + private PasswordField passwordField;
>
> @Component
> - private Form _form;
> + private Form form;
>
> String onSuccess()
> {
> - if (!_authenticator.isValid(_userName, _password))
> + if (!authenticator.isValid(userName, password))
> {
> - _form.recordError(_passwordField, "Invalid user name or password.");
> + form.recordError(passwordField, "Invalid user name or password.");
> return null;
> }
>
> @@ -112,22 +112,22 @@
>
> public String getPassword()
> {
> - return _password;
> + return password;
> }
>
> public void setPassword(String password)
> {
> - _password = password;
> + password = password;
> }
>
> public String getUserName()
> {
> - return _userName;
> + return userName;
> }
>
> public void setUserName(String userName)
> {
> - _userName = userName;
> + userName = userName;
> }
> }
> +---+
> @@ -263,11 +263,11 @@
>
> . . .
>
> - private int _quantity;
> + private int quantity;
>
> String onToClientFromQuantity()
> {
> - if (_quantity == 0) return "";
> + if (quantity == 0) return "";
>
> return null;
> }
>
> Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/index.apt
> URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/index.apt?rev=654547&r1=654546&r2=654547&view=diff
> ==============================================================================
> --- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/index.apt (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/index.apt Thu May 8 08:19:05 2008
> @@ -118,22 +118,22 @@
> {
> @Persist
> @Property
> - private String _userId;
> + private String userId;
>
> @Property
> - private String _password;
> + private String password;
>
> @Component
> - private Form _form;
> + private Form form;
>
> @Inject
> - private LoginAuthenticator _authenticator;
> + private LoginAuthenticator authenticator;
>
> void onValidateForm()
> {
> - if (! _authenticator.isValidLogin(_userId, _password))
> + if (! authenticator.isValidLogin(userId, password))
> {
> - _form.recordError("Invalid user name or password.");
> + form.recordError("Invalid user name or password.");
> }
> }
>
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
For additional commands, e-mail: dev-help@tapestry.apache.org