You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2008/05/07 16:56:06 UTC
svn commit: r654133 [2/3] - in /tapestry/tapestry5/trunk:
tapestry-core/src/main/java/org/apache/tapestry/corelib/data/
tapestry-core/src/main/java/org/apache/tapestry/corelib/internal/
tapestry-core/src/main/java/org/apache/tapestry/corelib/mixins/ ta...
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/TapestryAppInitializer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/TapestryAppInitializer.java?rev=654133&r1=654132&r2=654133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/TapestryAppInitializer.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/TapestryAppInitializer.java Wed May 7 07:55:59 2008
@@ -35,17 +35,17 @@
*/
public class TapestryAppInitializer
{
- private final SymbolProvider _appProvider;
+ private final SymbolProvider appProvider;
- private final String _appName;
+ private final String appName;
- private final String _aliasMode;
+ private final String aliasMode;
- private final long _startTime;
+ private final long startTime;
- private long _registryCreatedTime;
+ private final RegistryBuilder builder = new RegistryBuilder();
- private final RegistryBuilder _builder = new RegistryBuilder();
+ private long registryCreatedTime;
public TapestryAppInitializer(String appPackage, String appName, String aliasMode)
{
@@ -59,27 +59,27 @@
*/
public TapestryAppInitializer(SymbolProvider appProvider, String appName, String aliasMode)
{
- _appProvider = appProvider;
+ this.appProvider = appProvider;
- String appPackage = _appProvider.valueForSymbol(InternalConstants.TAPESTRY_APP_PACKAGE_PARAM);
+ String appPackage = appProvider.valueForSymbol(InternalConstants.TAPESTRY_APP_PACKAGE_PARAM);
- _appName = appName;
- _aliasMode = aliasMode;
+ this.appName = appName;
+ this.aliasMode = aliasMode;
- _startTime = System.currentTimeMillis();
+ startTime = System.currentTimeMillis();
if (!Boolean.parseBoolean(appProvider.valueForSymbol(InternalConstants.DISABLE_DEFAULT_MODULES_PARAM)))
{
- IOCUtilities.addDefaultModules(_builder);
+ IOCUtilities.addDefaultModules(builder);
}
// This gets added automatically.
addModules(TapestryModule.class);
- String className = appPackage + ".services." + InternalUtils.capitalize(_appName) + "Module";
+ String className = appPackage + ".services." + InternalUtils.capitalize(this.appName) + "Module";
try
{
@@ -89,7 +89,7 @@
Class moduleClass = Thread.currentThread().getContextClassLoader().loadClass(className);
- _builder.add(moduleClass);
+ builder.add(moduleClass);
}
catch (ClassNotFoundException ex)
{
@@ -110,40 +110,40 @@
public void addModules(ModuleDef... moduleDefs)
{
for (ModuleDef def : moduleDefs)
- _builder.add(def);
+ builder.add(def);
}
public void addModules(Class... moduleBuilderClasses)
{
- _builder.add(moduleBuilderClasses);
+ builder.add(moduleBuilderClasses);
}
private void addSyntheticSymbolSourceModule()
{
ContributionDef symbolSourceContribution = new SyntheticSymbolSourceContributionDef("ServletContext",
- _appProvider,
+ appProvider,
"before:ApplicationDefaults");
ContributionDef aliasModeContribution = new SyntheticSymbolSourceContributionDef("AliasMode",
new SingleKeySymbolProvider(
InternalConstants.TAPESTRY_ALIAS_MODE_SYMBOL,
- _aliasMode),
+ aliasMode),
"before:ServletContext");
ContributionDef appNameContribution = new SyntheticSymbolSourceContributionDef("AppName",
new SingleKeySymbolProvider(
InternalConstants.TAPESTRY_APP_NAME_SYMBOL,
- _appName),
+ appName),
"before:ServletContext");
- _builder.add(new SyntheticModuleDef(symbolSourceContribution, aliasModeContribution, appNameContribution));
+ builder.add(new SyntheticModuleDef(symbolSourceContribution, aliasModeContribution, appNameContribution));
}
public Registry getRegistry()
{
- _registryCreatedTime = System.currentTimeMillis();
+ registryCreatedTime = System.currentTimeMillis();
- return _builder.build();
+ return builder.build();
}
/**
@@ -151,7 +151,7 @@
*/
public long getRegistryCreatedTime()
{
- return _registryCreatedTime;
+ return registryCreatedTime;
}
/**
@@ -159,6 +159,6 @@
*/
public long getStartTime()
{
- return _startTime;
+ return startTime;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/TapestryInternalUtils.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/TapestryInternalUtils.java?rev=654133&r1=654132&r2=654133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/TapestryInternalUtils.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/TapestryInternalUtils.java Wed May 7 07:55:59 2008
@@ -344,26 +344,26 @@
private static class PropertyOrder implements Comparable<PropertyOrder>
{
- final String _propertyName;
+ final String propertyName;
- final int _classDepth;
+ final int classDepth;
- final int _sortKey;
+ final int sortKey;
public PropertyOrder(final String propertyName, int classDepth, int sortKey)
{
- _propertyName = propertyName;
- _classDepth = classDepth;
- _sortKey = sortKey;
+ this.propertyName = propertyName;
+ this.classDepth = classDepth;
+ this.sortKey = sortKey;
}
public int compareTo(PropertyOrder o)
{
- int result = _classDepth - o._classDepth;
+ int result = classDepth - o.classDepth;
- if (result == 0) result = _sortKey - o._sortKey;
+ if (result == 0) result = sortKey - o.sortKey;
- if (result == 0) result = _propertyName.compareTo(o._propertyName);
+ if (result == 0) result = propertyName.compareTo(o.propertyName);
return result;
}
@@ -418,7 +418,7 @@
for (PropertyOrder po : properties)
{
- String name = po._propertyName;
+ String name = po.propertyName;
List<String> propertyConstraints = constraints.get(name);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/URLEventContext.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/URLEventContext.java?rev=654133&r1=654132&r2=654133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/URLEventContext.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/URLEventContext.java Wed May 7 07:55:59 2008
@@ -23,23 +23,23 @@
*/
public class URLEventContext implements EventContext
{
- private final ContextValueEncoder _valueEncoder;
+ private final ContextValueEncoder valueEncoder;
- private final String[] _values;
+ private final String[] values;
public URLEventContext(ContextValueEncoder valueEncoder, String[] values)
{
- _valueEncoder = valueEncoder;
- _values = values;
+ this.valueEncoder = valueEncoder;
+ this.values = values;
}
public int getCount()
{
- return _values.length;
+ return values.length;
}
public <T> T get(Class<T> desiredType, int index)
{
- return _valueEncoder.toValue(desiredType, _values[index]);
+ return valueEncoder.toValue(desiredType, values[index]);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/beaneditor/BeanModelImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/beaneditor/BeanModelImpl.java?rev=654133&r1=654132&r2=654133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/beaneditor/BeanModelImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/beaneditor/BeanModelImpl.java Wed May 7 07:55:59 2008
@@ -22,10 +22,7 @@
import org.apache.tapestry.ioc.Messages;
import org.apache.tapestry.ioc.ObjectLocator;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newCaseInsensitiveMap;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
+import org.apache.tapestry.ioc.internal.util.Defense;
import org.apache.tapestry.ioc.services.ClassFabUtils;
import org.apache.tapestry.ioc.services.TypeCoercer;
import org.apache.tapestry.services.PropertyConduitSource;
@@ -35,21 +32,21 @@
public class BeanModelImpl<T> implements BeanModel<T>
{
- private final Class<T> _beanType;
+ private final Class<T> beanType;
- private final PropertyConduitSource _propertyConduitSource;
+ private final PropertyConduitSource propertyConduitSource;
- private final TypeCoercer _typeCoercer;
+ private final TypeCoercer typeCoercer;
- private final Messages _messages;
+ private final Messages messages;
- private final ObjectLocator _locator;
+ private final ObjectLocator locator;
- private final Map<String, PropertyModel> _properties = newCaseInsensitiveMap();
+ private final Map<String, PropertyModel> properties = CollectionFactory.newCaseInsensitiveMap();
// The list of property names, in desired order (generally not alphabetical order).
- private final List<String> _propertyNames = CollectionFactory.newList();
+ private final List<String> propertyNames = CollectionFactory.newList();
public BeanModelImpl(
Class<T> beanType, PropertyConduitSource
@@ -58,21 +55,21 @@
messages, ObjectLocator locator)
{
- _beanType = beanType;
- _propertyConduitSource = propertyConduitSource;
- _typeCoercer = typeCoercer;
- _messages = messages;
- _locator = locator;
+ this.beanType = beanType;
+ this.propertyConduitSource = propertyConduitSource;
+ this.typeCoercer = typeCoercer;
+ this.messages = messages;
+ this.locator = locator;
}
public Class<T> getBeanType()
{
- return _beanType;
+ return beanType;
}
public T newInstance()
{
- return _locator.autobuild(_beanType);
+ return locator.autobuild(beanType);
}
public PropertyModel add(String propertyName)
@@ -84,18 +81,18 @@
private void validateNewPropertyName(String propertyName)
{
- notBlank(propertyName, "propertyName");
+ Defense.notBlank(propertyName, "propertyName");
- if (_properties.containsKey(propertyName))
+ if (properties.containsKey(propertyName))
throw new RuntimeException(BeanEditorMessages.duplicatePropertyName(
- _beanType,
+ beanType,
propertyName));
}
public PropertyModel add(RelativePosition position, String existingPropertyName,
String propertyName, PropertyConduit conduit)
{
- notNull(position, "position");
+ Defense.notNull(position, "position");
validateNewPropertyName(propertyName);
@@ -105,15 +102,15 @@
// Use the case normalized property name.
- int pos = _propertyNames.indexOf(existing.getPropertyName());
+ int pos = propertyNames.indexOf(existing.getPropertyName());
- PropertyModel newModel = new PropertyModelImpl(this, propertyName, conduit, _messages);
+ PropertyModel newModel = new PropertyModelImpl(this, propertyName, conduit, messages);
- _properties.put(propertyName, newModel);
+ properties.put(propertyName, newModel);
int offset = position == RelativePosition.AFTER ? 1 : 0;
- _propertyNames.add(pos + offset, propertyName);
+ propertyNames.add(pos + offset, propertyName);
return newModel;
}
@@ -130,38 +127,38 @@
{
validateNewPropertyName(propertyName);
- PropertyModel propertyModel = new PropertyModelImpl(this, propertyName, conduit, _messages);
+ PropertyModel propertyModel = new PropertyModelImpl(this, propertyName, conduit, messages);
- _properties.put(propertyName, propertyModel);
+ properties.put(propertyName, propertyModel);
// Remember the order in which the properties were added.
- _propertyNames.add(propertyName);
+ propertyNames.add(propertyName);
return propertyModel;
}
private CoercingPropertyConduitWrapper createConduit(String propertyName)
{
- return new CoercingPropertyConduitWrapper(_propertyConduitSource.create(_beanType,
- propertyName), _typeCoercer);
+ return new CoercingPropertyConduitWrapper(propertyConduitSource.create(beanType,
+ propertyName), typeCoercer);
}
public PropertyModel get(String propertyName)
{
- PropertyModel propertyModel = _properties.get(propertyName);
+ PropertyModel propertyModel = properties.get(propertyName);
if (propertyModel == null)
- throw new RuntimeException(BeanEditorMessages.unknownProperty(_beanType,
+ throw new RuntimeException(BeanEditorMessages.unknownProperty(beanType,
propertyName,
- _properties.keySet()));
+ properties.keySet()));
return propertyModel;
}
public PropertyModel getById(String propertyId)
{
- for (PropertyModel model : _properties.values())
+ for (PropertyModel model : properties.values())
{
if (model.getId().equalsIgnoreCase(propertyId)) return model;
}
@@ -171,36 +168,36 @@
List<String> ids = CollectionFactory.newList();
- for (PropertyModel model : _properties.values())
+ for (PropertyModel model : properties.values())
{
ids.add(model.getId());
}
- throw new RuntimeException(BeanEditorMessages.unknownPropertyId(_beanType,
+ throw new RuntimeException(BeanEditorMessages.unknownPropertyId(beanType,
propertyId, ids));
}
public List<String> getPropertyNames()
{
- return CollectionFactory.newList(_propertyNames);
+ return CollectionFactory.newList(propertyNames);
}
public BeanModel exclude(String... propertyNames)
{
for (String propertyName : propertyNames)
{
- PropertyModel model = _properties.get(propertyName);
+ PropertyModel model = properties.get(propertyName);
if (model == null) continue;
// De-referencing from the model is needed because the name provided may not be a
// case-exact match, so we get the normalized or canonical name from the model because
- // that's the one in _propertyNames.
+ // that's the one in propertyNames.
- _propertyNames.remove(model.getPropertyName());
+ this.propertyNames.remove(model.getPropertyName());
- _properties.remove(propertyName);
+ properties.remove(propertyName);
}
return this;
@@ -208,8 +205,8 @@
public BeanModel reorder(String... propertyNames)
{
- List<String> remainingPropertyNames = newList(_propertyNames);
- List<String> reorderedPropertyNames = newList();
+ List<String> remainingPropertyNames = CollectionFactory.newList(this.propertyNames);
+ List<String> reorderedPropertyNames = CollectionFactory.newList();
for (String name : propertyNames)
{
@@ -223,18 +220,18 @@
remainingPropertyNames.remove(canonical);
}
- _propertyNames.clear();
- _propertyNames.addAll(reorderedPropertyNames);
+ this.propertyNames.clear();
+ this.propertyNames.addAll(reorderedPropertyNames);
// Any unspecified names are ordered to the end. Don't want them? Remove them instead.
- _propertyNames.addAll(remainingPropertyNames);
+ this.propertyNames.addAll(remainingPropertyNames);
return this;
}
public BeanModel include(String... propertyNames)
{
- List<String> reorderedPropertyNames = newList();
+ List<String> reorderedPropertyNames = CollectionFactory.newList();
Map<String, PropertyModel> reduced = CollectionFactory.newCaseInsensitiveMap();
@@ -250,11 +247,11 @@
}
- _propertyNames.clear();
- _propertyNames.addAll(reorderedPropertyNames);
+ this.propertyNames.clear();
+ this.propertyNames.addAll(reorderedPropertyNames);
- _properties.clear();
- _properties.putAll(reduced);
+ properties.clear();
+ properties.putAll(reduced);
return this;
}
@@ -263,12 +260,12 @@
public String toString()
{
StringBuilder builder = new StringBuilder("BeanModel[");
- builder.append(ClassFabUtils.toJavaClassName(_beanType));
+ builder.append(ClassFabUtils.toJavaClassName(beanType));
builder.append(" properties:");
String sep = "";
- for (String name : _propertyNames)
+ for (String name : propertyNames)
{
builder.append(sep);
builder.append(name);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/beaneditor/PropertyModelImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/beaneditor/PropertyModelImpl.java?rev=654133&r1=654132&r2=654133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/beaneditor/PropertyModelImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/beaneditor/PropertyModelImpl.java Wed May 7 07:55:59 2008
@@ -19,110 +19,110 @@
import org.apache.tapestry.beaneditor.PropertyModel;
import org.apache.tapestry.internal.TapestryInternalUtils;
import org.apache.tapestry.ioc.Messages;
-import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
+import org.apache.tapestry.ioc.internal.util.Defense;
import org.apache.tapestry.ioc.services.ClassFabUtils;
import java.lang.annotation.Annotation;
public class PropertyModelImpl implements PropertyModel
{
- private final BeanModel _model;
+ private final BeanModel model;
- private final String _name;
+ private final String name;
- private final PropertyConduit _conduit;
+ private final PropertyConduit conduit;
- private final String _id;
+ private final String id;
- private String _label;
+ private String label;
- private String _dataType;
+ private String dataType;
- private boolean _sortable;
+ private boolean sortable;
public PropertyModelImpl(BeanModel model, String name, PropertyConduit conduit, Messages messages)
{
- _model = model;
- _name = name;
- _conduit = conduit;
+ this.model = model;
+ this.name = name;
+ this.conduit = conduit;
- _id = TapestryInternalUtils.extractIdFromPropertyExpression(name);
+ id = TapestryInternalUtils.extractIdFromPropertyExpression(name);
- _label = TapestryInternalUtils.defaultLabel(_id, messages, name);
+ label = TapestryInternalUtils.defaultLabel(id, messages, name);
// Primitive types need to be converted to wrapper types before checking to see
// if they are sortable.
Class wrapperType = ClassFabUtils.getWrapperType(getPropertyType());
- _sortable = Comparable.class.isAssignableFrom(wrapperType);
+ sortable = Comparable.class.isAssignableFrom(wrapperType);
}
public String getId()
{
- return _id;
+ return id;
}
public Class getPropertyType()
{
- return _conduit == null ? Object.class : _conduit.getPropertyType();
+ return conduit == null ? Object.class : conduit.getPropertyType();
}
public PropertyConduit getConduit()
{
- return _conduit;
+ return conduit;
}
public PropertyModel label(String label)
{
- notBlank(label, "label");
+ Defense.notBlank(label, "label");
- _label = label;
+ this.label = label;
return this;
}
public String getLabel()
{
- return _label;
+ return label;
}
public String getPropertyName()
{
- return _name;
+ return name;
}
public BeanModel model()
{
- return _model;
+ return model;
}
public PropertyModel dataType(String dataType)
{
- _dataType = dataType;
+ this.dataType = dataType;
return this;
}
public String getDataType()
{
- return _dataType;
+ return dataType;
}
public boolean isSortable()
{
- return _sortable;
+ return sortable;
}
public PropertyModel sortable(boolean sortable)
{
- _sortable = sortable;
+ this.sortable = sortable;
return this;
}
public <T extends Annotation> T getAnnotation(Class<T> annotationClass)
{
- return _conduit == null ? null : _conduit.getAnnotation(annotationClass);
+ return conduit == null ? null : conduit.getAnnotation(annotationClass);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/AssetBindingFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/AssetBindingFactory.java?rev=654133&r1=654132&r2=654133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/AssetBindingFactory.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/AssetBindingFactory.java Wed May 7 07:55:59 2008
@@ -31,27 +31,27 @@
*/
public class AssetBindingFactory implements BindingFactory
{
- private final AssetSource _source;
+ private final AssetSource source;
- private final boolean _forceAbsoluteURIs;
+ private final boolean forceAbsoluteURIs;
public class AssetBinding extends AbstractBinding
{
- private final String _description;
+ private final String description;
- private final Asset _asset;
+ private final Asset asset;
protected AssetBinding(String description, Asset asset, Location location)
{
super(location);
- _description = description;
- _asset = asset;
+ this.description = description;
+ this.asset = asset;
}
public Object get()
{
- return _asset;
+ return asset;
}
/**
@@ -66,13 +66,13 @@
@Override
public boolean isInvariant()
{
- return _forceAbsoluteURIs;
+ return forceAbsoluteURIs;
}
@Override
public String toString()
{
- return String.format("AssetBinding[%s: %s]", _description, _asset);
+ return String.format("AssetBinding[%s: %s]", description, asset);
}
}
@@ -81,8 +81,8 @@
@Symbol(TapestryConstants.FORCE_ABSOLUTE_URIS_SYMBOL)
boolean forceAbsoluteURIs)
{
- _source = source;
- _forceAbsoluteURIs = forceAbsoluteURIs;
+ this.source = source;
+ this.forceAbsoluteURIs = forceAbsoluteURIs;
}
public Binding newBinding(String description, ComponentResources container, ComponentResources component,
@@ -90,7 +90,7 @@
{
Resource baseResource = container.getBaseResource();
- Asset asset = _source.getAsset(baseResource, expression, container.getLocale());
+ Asset asset = source.getAsset(baseResource, expression, container.getLocale());
return new AssetBinding(description, asset, location);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/BlockBinding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/BlockBinding.java?rev=654133&r1=654132&r2=654133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/BlockBinding.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/BlockBinding.java Wed May 7 07:55:59 2008
@@ -19,30 +19,29 @@
public class BlockBinding extends AbstractBinding
{
- private final String _description;
+ private final String description;
- private final ComponentResources _component;
+ private final ComponentResources component;
- private final String _blockId;
+ private final String blockId;
- public BlockBinding(final String description, final ComponentResources component,
- final String blockId, Location location)
+ public BlockBinding(String description, ComponentResources component, String blockId, Location location)
{
super(location);
- _description = description;
- _component = component;
- _blockId = blockId;
+ this.description = description;
+ this.component = component;
+ this.blockId = blockId;
}
public Object get()
{
- return _component.getBlock(_blockId);
+ return component.getBlock(blockId);
}
@Override
public String toString()
{
- return String.format("BlockBinding[%s: %s]", _description, _blockId);
+ return String.format("BlockBinding[%s: %s]", description, blockId);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/ComponentBinding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/ComponentBinding.java?rev=654133&r1=654132&r2=654133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/ComponentBinding.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/ComponentBinding.java Wed May 7 07:55:59 2008
@@ -19,30 +19,30 @@
public class ComponentBinding extends AbstractBinding
{
- private final String _description;
+ private final String description;
- private final ComponentResources _resources;
+ private final ComponentResources resources;
- private final String _componentId;
+ private final String componentId;
public ComponentBinding(String description, ComponentResources resources, String componentId,
Location location)
{
super(location);
- _description = description;
- _resources = resources;
- _componentId = componentId;
+ this.description = description;
+ this.resources = resources;
+ this.componentId = componentId;
}
public Object get()
{
- return _resources.getEmbeddedComponent(_componentId);
+ return resources.getEmbeddedComponent(componentId);
}
@Override
public String toString()
{
- return String.format("ComponentResources[%s %s]", _description, _componentId);
+ return String.format("ComponentResources[%s %s]", description, componentId);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/LiteralBinding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/LiteralBinding.java?rev=654133&r1=654132&r2=654133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/LiteralBinding.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/LiteralBinding.java Wed May 7 07:55:59 2008
@@ -26,25 +26,25 @@
*/
public class LiteralBinding extends AbstractBinding
{
- private final String _description;
+ private final String description;
- private final Object _value;
+ private final Object value;
public LiteralBinding(String description, Object value, Location location)
{
super(location);
- _description = description;
- _value = value;
+ this.description = description;
+ this.value = value;
}
public Object get()
{
- return _value;
+ return value;
}
@Override
public String toString()
{
- return String.format("LiteralBinding[%s: %s]", _description, _value);
+ return String.format("LiteralBinding[%s: %s]", description, value);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/NullFieldStrategyBindingFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/NullFieldStrategyBindingFactory.java?rev=654133&r1=654132&r2=654133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/NullFieldStrategyBindingFactory.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/NullFieldStrategyBindingFactory.java Wed May 7 07:55:59 2008
@@ -27,17 +27,17 @@
*/
public class NullFieldStrategyBindingFactory implements BindingFactory
{
- private NullFieldStrategySource _strategySource;
+ private NullFieldStrategySource strategySource;
public NullFieldStrategyBindingFactory(NullFieldStrategySource strategySource)
{
- _strategySource = strategySource;
+ this.strategySource = strategySource;
}
public Binding newBinding(String description, ComponentResources container, ComponentResources component,
String expression, Location location)
{
- NullFieldStrategy strategy = _strategySource.get(expression);
+ NullFieldStrategy strategy = strategySource.get(expression);
return new LiteralBinding(description, strategy, location);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/PropBinding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/PropBinding.java?rev=654133&r1=654132&r2=654133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/PropBinding.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/PropBinding.java Wed May 7 07:55:59 2008
@@ -26,20 +26,20 @@
*/
public class PropBinding extends AbstractBinding
{
- private final Object _root;
+ private final Object root;
- private final PropertyConduit _conduit;
+ private final PropertyConduit conduit;
- private final String _toString;
+ private final String toString;
public PropBinding(final Object root, final PropertyConduit conduit, final String toString,
final Location location)
{
super(location);
- _root = root;
- _conduit = conduit;
- _toString = toString;
+ this.root = root;
+ this.conduit = conduit;
+ this.toString = toString;
}
/**
@@ -50,7 +50,7 @@
{
try
{
- return _conduit.get(_root);
+ return conduit.get(root);
}
catch (Exception ex)
{
@@ -63,7 +63,7 @@
{
try
{
- _conduit.set(_root, value);
+ conduit.set(root, value);
}
catch (Exception ex)
{
@@ -74,7 +74,7 @@
@Override
public String toString()
{
- return _toString;
+ return toString;
}
/**
@@ -89,13 +89,13 @@
@Override
public Class getBindingType()
{
- return _conduit.getPropertyType();
+ return conduit.getPropertyType();
}
@Override
public <T extends Annotation> T getAnnotation(Class<T> annotationClass)
{
- return _conduit.getAnnotation(annotationClass);
+ return conduit.getAnnotation(annotationClass);
}
}
\ No newline at end of file
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/PropBindingFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/PropBindingFactory.java?rev=654133&r1=654132&r2=654133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/PropBindingFactory.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/PropBindingFactory.java Wed May 7 07:55:59 2008
@@ -30,11 +30,11 @@
*/
public class PropBindingFactory implements BindingFactory
{
- private final PropertyConduitSource _source;
+ private final PropertyConduitSource source;
public PropBindingFactory(PropertyConduitSource propertyConduitSource)
{
- _source = propertyConduitSource;
+ source = propertyConduitSource;
}
public Binding newBinding(String description, ComponentResources container,
@@ -45,7 +45,7 @@
try
{
- PropertyConduit conduit = _source.create(targetClass, expression);
+ PropertyConduit conduit = source.create(targetClass, expression);
String toString = String.format("PropBinding[%s %s(%s)]", description, container
.getCompleteId(), expression);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/RenderVariableBinding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/RenderVariableBinding.java?rev=654133&r1=654132&r2=654133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/RenderVariableBinding.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/RenderVariableBinding.java Wed May 7 07:55:59 2008
@@ -19,23 +19,23 @@
public class RenderVariableBinding extends AbstractBinding
{
- private final String _description;
- private final ComponentResources _resources;
- private final String _name;
+ private final String description;
+ private final ComponentResources resources;
+ private final String name;
public RenderVariableBinding(String description, ComponentResources resources, String name, Location location)
{
super(location);
- _description = description;
- _resources = resources;
- _name = name;
+ this.description = description;
+ this.resources = resources;
+ this.name = name;
}
@Override
public void set(Object value)
{
- _resources.storeRenderVariable(_name, value);
+ resources.storeRenderVariable(name, value);
}
/**
@@ -50,13 +50,13 @@
@Override
public String toString()
{
- return String.format("RenderVariable[%s %s]", _description, _name);
+ return String.format("RenderVariable[%s %s]", description, name);
}
public Object get()
{
- return _resources.getRenderVariable(_name);
+ return resources.getRenderVariable(name);
}
/**
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/TranslateBindingFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/TranslateBindingFactory.java?rev=654133&r1=654132&r2=654133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/TranslateBindingFactory.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/TranslateBindingFactory.java Wed May 7 07:55:59 2008
@@ -26,17 +26,17 @@
*/
public class TranslateBindingFactory implements BindingFactory
{
- private final TranslatorSource _source;
+ private final TranslatorSource source;
public TranslateBindingFactory(TranslatorSource source)
{
- _source = source;
+ this.source = source;
}
public Binding newBinding(String description, ComponentResources container,
ComponentResources component, String expression, Location location)
{
- Translator translator = _source.get(expression);
+ Translator translator = source.get(expression);
return new LiteralBinding(description, translator, location);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/ValidateBindingFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/ValidateBindingFactory.java?rev=654133&r1=654132&r2=654133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/ValidateBindingFactory.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/ValidateBindingFactory.java Wed May 7 07:55:59 2008
@@ -29,11 +29,11 @@
*/
public class ValidateBindingFactory implements BindingFactory
{
- private final FieldValidatorSource _fieldValidatorSource;
+ private final FieldValidatorSource fieldValidatorSource;
public ValidateBindingFactory(FieldValidatorSource fieldValidatorSource)
{
- _fieldValidatorSource = fieldValidatorSource;
+ this.fieldValidatorSource = fieldValidatorSource;
}
public Binding newBinding(String description, ComponentResources container,
@@ -52,7 +52,7 @@
// component whose parameter is to be bound) rather than the containing component, the way
// most factories work.
- FieldValidator validator = _fieldValidatorSource.createValidators(field, expression);
+ FieldValidator validator = fieldValidatorSource.createValidators(field, expression);
return new LiteralBinding(description, validator, location);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/event/InvalidationEventHubImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/event/InvalidationEventHubImpl.java?rev=654133&r1=654132&r2=654133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/event/InvalidationEventHubImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/event/InvalidationEventHubImpl.java Wed May 7 07:55:59 2008
@@ -25,14 +25,14 @@
*/
public class InvalidationEventHubImpl implements InvalidationEventHub
{
- private final List<InvalidationListener> _listeners = newThreadSafeList();
+ private final List<InvalidationListener> listeners = newThreadSafeList();
/**
* Notifies all {@link InvalidationListener listener}s.
*/
protected final void fireInvalidationEvent()
{
- for (InvalidationListener listener : _listeners)
+ for (InvalidationListener listener : listeners)
{
listener.objectWasInvalidated();
}
@@ -40,6 +40,6 @@
public final void addInvalidationListener(InvalidationListener listener)
{
- _listeners.add(listener);
+ listeners.add(listener);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/grid/CollectionGridDataSource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/grid/CollectionGridDataSource.java?rev=654133&r1=654132&r2=654133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/grid/CollectionGridDataSource.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/grid/CollectionGridDataSource.java Wed May 7 07:55:59 2008
@@ -18,8 +18,8 @@
import org.apache.tapestry.grid.ColumnSort;
import org.apache.tapestry.grid.GridDataSource;
import org.apache.tapestry.grid.SortConstraint;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
+import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry.ioc.internal.util.Defense;
import java.util.Collection;
import java.util.Collections;
@@ -28,21 +28,21 @@
public class CollectionGridDataSource implements GridDataSource
{
- private final List _list;
+ private final List list;
@SuppressWarnings("unchecked")
public CollectionGridDataSource(final Collection collection)
{
- notNull(collection, "collection");
+ Defense.notNull(collection, "collection");
// Copy the collection so that we can sort it without disturbing the original
- _list = newList(collection);
+ list = CollectionFactory.newList(collection);
}
public int getAvailableRows()
{
- return _list.size();
+ return list.size();
}
public void prepare(int startIndex, int endIndex, List<SortConstraint> sortConstraints)
@@ -94,7 +94,7 @@
// We can freely sort this list because its just a copy.
- Collections.sort(_list, reverseComparator);
+ Collections.sort(list, reverseComparator);
}
}
@@ -103,12 +103,12 @@
*/
public Class getRowType()
{
- return _list.isEmpty() ? null : _list.get(0).getClass();
+ return list.isEmpty() ? null : list.get(0).getClass();
}
public Object getRowValue(int index)
{
- return _list.get(index);
+ return list.get(index);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/model/MutableComponentModelImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/model/MutableComponentModelImpl.java?rev=654133&r1=654132&r2=654133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/model/MutableComponentModelImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/model/MutableComponentModelImpl.java Wed May 7 07:55:59 2008
@@ -16,8 +16,8 @@
import org.apache.tapestry.ioc.Location;
import org.apache.tapestry.ioc.Resource;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.*;
-import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
+import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry.ioc.internal.util.Defense;
import org.apache.tapestry.ioc.internal.util.IdAllocator;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.model.*;
@@ -32,48 +32,48 @@
*/
public final class MutableComponentModelImpl implements MutableComponentModel
{
- private final ComponentModel _parentModel;
+ private final ComponentModel parentModel;
- private final Resource _baseResource;
+ private final Resource baseResource;
- private final String _componentClassName;
+ private final String componentClassName;
- private final IdAllocator _persistentFieldNameAllocator = new IdAllocator();
+ private final IdAllocator persistentFieldNameAllocator = new IdAllocator();
- private final Logger _logger;
+ private final Logger logger;
- private Map<String, ParameterModel> _parameters;
+ private Map<String, ParameterModel> parameters;
- private Map<String, EmbeddedComponentModel> _embeddedComponents;
+ private Map<String, EmbeddedComponentModel> embeddedComponents;
/**
* Maps from field name to strategy.
*/
- private Map<String, String> _persistentFields;
+ private Map<String, String> persistentFields;
- private List<String> _mixinClassNames;
+ private List<String> mixinClassNames;
- private boolean _informalParametersSupported;
+ private boolean informalParametersSupported;
- private boolean _mixinAfter;
+ private boolean mixinAfter;
- private Map<String, String> _metaData;
+ private Map<String, String> metaData;
public MutableComponentModelImpl(String componentClassName, Logger logger, Resource baseResource,
ComponentModel parentModel)
{
- _componentClassName = componentClassName;
- _logger = logger;
- _baseResource = baseResource;
- _parentModel = parentModel;
+ this.componentClassName = componentClassName;
+ this.logger = logger;
+ this.baseResource = baseResource;
+ this.parentModel = parentModel;
// Pre-allocate names from the parent, to avoid name collisions.
- if (_parentModel != null)
+ if (this.parentModel != null)
{
- for (String name : _parentModel.getPersistentFieldNames())
+ for (String name : this.parentModel.getPersistentFieldNames())
{
- _persistentFieldNameAllocator.allocateId(name);
+ persistentFieldNameAllocator.allocateId(name);
}
}
}
@@ -81,57 +81,57 @@
@Override
public String toString()
{
- return String.format("ComponentModel[%s]", _componentClassName);
+ return String.format("ComponentModel[%s]", componentClassName);
}
public Logger getLogger()
{
- return _logger;
+ return logger;
}
public Resource getBaseResource()
{
- return _baseResource;
+ return baseResource;
}
public String getComponentClassName()
{
- return _componentClassName;
+ return componentClassName;
}
public void addParameter(String name, boolean required, String defaultBindingPrefix)
{
- notBlank(name, "name");
- notBlank(defaultBindingPrefix, "defaultBindingPrefix");
+ Defense.notBlank(name, "name");
+ Defense.notBlank(defaultBindingPrefix, "defaultBindingPrefix");
// TODO: Check for conflict with base model
- if (_parameters == null) _parameters = newCaseInsensitiveMap();
+ if (parameters == null) parameters = CollectionFactory.newCaseInsensitiveMap();
else
{
- if (_parameters.containsKey(name))
- throw new IllegalArgumentException(ModelMessages.duplicateParameter(name, _componentClassName));
+ if (parameters.containsKey(name))
+ throw new IllegalArgumentException(ModelMessages.duplicateParameter(name, componentClassName));
}
- _parameters.put(name, new ParameterModelImpl(name, required, defaultBindingPrefix));
+ parameters.put(name, new ParameterModelImpl(name, required, defaultBindingPrefix));
}
public ParameterModel getParameterModel(String parameterName)
{
- ParameterModel result = InternalUtils.get(_parameters, parameterName.toLowerCase());
+ ParameterModel result = InternalUtils.get(parameters, parameterName.toLowerCase());
- if (result == null && _parentModel != null) result = _parentModel.getParameterModel(parameterName);
+ if (result == null && parentModel != null) result = parentModel.getParameterModel(parameterName);
return result;
}
public List<String> getParameterNames()
{
- List<String> names = newList();
+ List<String> names = CollectionFactory.newList();
- if (_parameters != null) names.addAll(_parameters.keySet());
+ if (parameters != null) names.addAll(parameters.keySet());
- if (_parentModel != null) names.addAll(_parentModel.getParameterNames());
+ if (parentModel != null) names.addAll(parentModel.getParameterNames());
Collections.sort(names);
@@ -140,7 +140,7 @@
public List<String> getDeclaredParameterNames()
{
- return InternalUtils.sortedKeys(_parameters);
+ return InternalUtils.sortedKeys(parameters);
}
public MutableEmbeddedComponentModel addEmbeddedComponent(String id, String type, String componentClassName,
@@ -148,27 +148,27 @@
{
// TODO: Parent compent model? Or would we simply override the parent?
- if (_embeddedComponents == null) _embeddedComponents = newCaseInsensitiveMap();
- else if (_embeddedComponents.containsKey(id))
- throw new IllegalArgumentException(ModelMessages.duplicateComponentId(id, _componentClassName));
+ if (embeddedComponents == null) embeddedComponents = CollectionFactory.newCaseInsensitiveMap();
+ else if (embeddedComponents.containsKey(id))
+ throw new IllegalArgumentException(ModelMessages.duplicateComponentId(id, this.componentClassName));
MutableEmbeddedComponentModel embedded = new MutableEmbeddedComponentModelImpl(id, type, componentClassName,
- _componentClassName,
+ this.componentClassName,
inheritInformalParameters,
location);
- _embeddedComponents.put(id, embedded);
+ embeddedComponents.put(id, embedded);
return embedded; // So that parameters can be filled in
}
public List<String> getEmbeddedComponentIds()
{
- List<String> result = newList();
+ List<String> result = CollectionFactory.newList();
- if (_embeddedComponents != null) result.addAll(_embeddedComponents.keySet());
+ if (embeddedComponents != null) result.addAll(embeddedComponents.keySet());
- if (_parentModel != null) result.addAll(_parentModel.getEmbeddedComponentIds());
+ if (parentModel != null) result.addAll(parentModel.getEmbeddedComponentIds());
Collections.sort(result);
@@ -177,18 +177,18 @@
public EmbeddedComponentModel getEmbeddedComponentModel(String componentId)
{
- EmbeddedComponentModel result = InternalUtils.get(_embeddedComponents, componentId);
+ EmbeddedComponentModel result = InternalUtils.get(embeddedComponents, componentId);
- if (result == null && _parentModel != null) result = _parentModel.getEmbeddedComponentModel(componentId);
+ if (result == null && parentModel != null) result = parentModel.getEmbeddedComponentModel(componentId);
return result;
}
public String getFieldPersistenceStrategy(String fieldName)
{
- String result = InternalUtils.get(_persistentFields, fieldName);
+ String result = InternalUtils.get(persistentFields, fieldName);
- if (result == null && _parentModel != null) result = _parentModel.getFieldPersistenceStrategy(fieldName);
+ if (result == null && parentModel != null) result = parentModel.getFieldPersistenceStrategy(fieldName);
if (result == null) throw new IllegalArgumentException(ModelMessages.missingPersistentField(fieldName));
@@ -197,39 +197,39 @@
public List<String> getPersistentFieldNames()
{
- return _persistentFieldNameAllocator.getAllocatedIds();
+ return persistentFieldNameAllocator.getAllocatedIds();
}
public String setFieldPersistenceStrategy(String fieldName, String strategy)
{
- String logicalFieldName = _persistentFieldNameAllocator.allocateId(fieldName);
+ String logicalFieldName = persistentFieldNameAllocator.allocateId(fieldName);
- if (_persistentFields == null) _persistentFields = newMap();
+ if (persistentFields == null) persistentFields = CollectionFactory.newMap();
- _persistentFields.put(logicalFieldName, strategy);
+ persistentFields.put(logicalFieldName, strategy);
return logicalFieldName;
}
public boolean isRootClass()
{
- return _parentModel == null;
+ return parentModel == null;
}
public void addMixinClassName(String mixinClassName)
{
- if (_mixinClassNames == null) _mixinClassNames = newList();
+ if (mixinClassNames == null) mixinClassNames = CollectionFactory.newList();
- _mixinClassNames.add(mixinClassName);
+ mixinClassNames.add(mixinClassName);
}
public List<String> getMixinClassNames()
{
- List<String> result = newList();
+ List<String> result = CollectionFactory.newList();
- if (_mixinClassNames != null) result.addAll(_mixinClassNames);
+ if (mixinClassNames != null) result.addAll(mixinClassNames);
- if (_parentModel != null) result.addAll(_parentModel.getMixinClassNames());
+ if (parentModel != null) result.addAll(parentModel.getMixinClassNames());
Collections.sort(result);
@@ -238,46 +238,46 @@
public void enableSupportsInformalParameters()
{
- _informalParametersSupported = true;
+ informalParametersSupported = true;
}
public boolean getSupportsInformalParameters()
{
- return _informalParametersSupported;
+ return informalParametersSupported;
}
public ComponentModel getParentModel()
{
- return _parentModel;
+ return parentModel;
}
public boolean isMixinAfter()
{
- return _mixinAfter;
+ return mixinAfter;
}
public void setMixinAfter(boolean mixinAfter)
{
- _mixinAfter = mixinAfter;
+ this.mixinAfter = mixinAfter;
}
public void setMeta(String key, String value)
{
- notBlank(key, "key");
- notBlank(value, "value");
+ Defense.notBlank(key, "key");
+ Defense.notBlank(value, "value");
- if (_metaData == null) _metaData = newCaseInsensitiveMap();
+ if (metaData == null) metaData = CollectionFactory.newCaseInsensitiveMap();
// TODO: Error if duplicate?
- _metaData.put(key, value);
+ metaData.put(key, value);
}
public String getMeta(String key)
{
- String result = InternalUtils.get(_metaData, key);
+ String result = InternalUtils.get(metaData, key);
- if (result == null && _parentModel != null) result = _parentModel.getMeta(key);
+ if (result == null && parentModel != null) result = parentModel.getMeta(key);
return result;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/model/MutableEmbeddedComponentModelImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/model/MutableEmbeddedComponentModelImpl.java?rev=654133&r1=654132&r2=654133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/model/MutableEmbeddedComponentModelImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/model/MutableEmbeddedComponentModelImpl.java Wed May 7 07:55:59 2008
@@ -17,7 +17,6 @@
import org.apache.tapestry.ioc.BaseLocatable;
import org.apache.tapestry.ioc.Location;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.model.MutableEmbeddedComponentModel;
@@ -27,100 +26,100 @@
public class MutableEmbeddedComponentModelImpl extends BaseLocatable implements MutableEmbeddedComponentModel
{
- private final String _id;
+ private final String id;
- private final String _componentType;
+ private final String componentType;
- private final String _componentClassName;
+ private final String componentClassName;
- private final String _declaredClass;
+ private final String declaredClass;
- private final boolean _inheritInformalParameters;
+ private final boolean inheritInformalParameters;
- private Map<String, String> _parameters;
+ private Map<String, String> parameters;
/**
* List of mixin class names.
*/
- private List<String> _mixinClassNames;
+ private List<String> mixinClassNames;
public MutableEmbeddedComponentModelImpl(String id, String componentType, String componentClassName,
String declaredClass, boolean inheritInformalParameters, Location location)
{
super(location);
- _id = id;
- _componentType = componentType;
- _componentClassName = componentClassName;
- _inheritInformalParameters = inheritInformalParameters;
- _declaredClass = declaredClass;
+ this.id = id;
+ this.componentType = componentType;
+ this.componentClassName = componentClassName;
+ this.inheritInformalParameters = inheritInformalParameters;
+ this.declaredClass = declaredClass;
}
public String getComponentClassName()
{
- return _componentClassName;
+ return componentClassName;
}
@Override
public String toString()
{
- return String.format("EmbeddedComponentModel[id=%s type=%s class=%s inheritInformals=%s]", _id, _componentType,
- _componentClassName, _inheritInformalParameters);
+ return String.format("EmbeddedComponentModel[id=%s type=%s class=%s inheritInformals=%s]", id, componentType,
+ componentClassName, inheritInformalParameters);
}
public void addParameter(String name, String value)
{
- if (_parameters == null) _parameters = newMap();
- else if (_parameters.containsKey(name))
- throw new IllegalArgumentException(ModelMessages.duplicateParameterValue(name, _id, _declaredClass));
+ if (parameters == null) parameters = CollectionFactory.newMap();
+ else if (parameters.containsKey(name))
+ throw new IllegalArgumentException(ModelMessages.duplicateParameterValue(name, id, declaredClass));
- _parameters.put(name, value);
+ parameters.put(name, value);
}
public String getId()
{
- return _id;
+ return id;
}
public String getComponentType()
{
- return _componentType;
+ return componentType;
}
public List<String> getParameterNames()
{
- return InternalUtils.sortedKeys(_parameters);
+ return InternalUtils.sortedKeys(parameters);
}
public String getParameterValue(String parameterName)
{
- return InternalUtils.get(_parameters, parameterName);
+ return InternalUtils.get(parameters, parameterName);
}
public List<String> getMixinClassNames()
{
- if (_mixinClassNames == null) return Collections.emptyList();
+ if (mixinClassNames == null) return Collections.emptyList();
- return Collections.unmodifiableList(_mixinClassNames);
+ return Collections.unmodifiableList(mixinClassNames);
}
public void addMixin(String mixinClassName)
{
- if (_mixinClassNames == null)
+ if (mixinClassNames == null)
{
- _mixinClassNames = CollectionFactory.newList();
+ mixinClassNames = CollectionFactory.newList();
}
else
{
- if (_mixinClassNames.contains(mixinClassName)) throw new IllegalArgumentException(ModelMessages
- .duplicateMixin(mixinClassName, _id));
+ if (mixinClassNames.contains(mixinClassName)) throw new IllegalArgumentException(ModelMessages
+ .duplicateMixin(mixinClassName, id));
}
- _mixinClassNames.add(mixinClassName);
+ mixinClassNames.add(mixinClassName);
}
public boolean getInheritInformalParameters()
{
- return _inheritInformalParameters;
+ return inheritInformalParameters;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/model/ParameterModelImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/model/ParameterModelImpl.java?rev=654133&r1=654132&r2=654133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/model/ParameterModelImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/model/ParameterModelImpl.java Wed May 7 07:55:59 2008
@@ -18,31 +18,31 @@
public class ParameterModelImpl implements ParameterModel
{
- private final String _name;
+ private final String name;
- private final boolean _required;
+ private final boolean required;
- private final String _defaultBindingPrefix;
+ private final String defaultBindingPrefix;
public ParameterModelImpl(String name, boolean required, String defaultBindingPrefix)
{
- _name = name;
- _required = required;
- _defaultBindingPrefix = defaultBindingPrefix;
+ this.name = name;
+ this.required = required;
+ this.defaultBindingPrefix = defaultBindingPrefix;
}
public String getName()
{
- return _name;
+ return name;
}
public boolean isRequired()
{
- return _required;
+ return required;
}
public String getDefaultBindingPrefix()
{
- return _defaultBindingPrefix;
+ return defaultBindingPrefix;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/AttributeToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/AttributeToken.java?rev=654133&r1=654132&r2=654133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/AttributeToken.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/AttributeToken.java Wed May 7 07:55:59 2008
@@ -21,19 +21,19 @@
*/
public class AttributeToken extends TemplateToken
{
- private final String _namespaceURI;
+ private final String namespaceURI;
- private final String _name;
+ private final String name;
- private final String _value;
+ private final String value;
public AttributeToken(String namespaceURI, String name, String value, Location location)
{
super(TokenType.ATTRIBUTE, location);
- _namespaceURI = namespaceURI;
- _name = name;
- _value = value;
+ this.namespaceURI = namespaceURI;
+ this.name = name;
+ this.value = value;
}
/**
@@ -41,7 +41,7 @@
*/
public String getName()
{
- return _name;
+ return name;
}
/**
@@ -49,7 +49,7 @@
*/
public String getValue()
{
- return _value;
+ return value;
}
/**
@@ -57,7 +57,7 @@
*/
public String getNamespaceURI()
{
- return _namespaceURI;
+ return namespaceURI;
}
@Override
@@ -65,9 +65,9 @@
{
StringBuilder builder = new StringBuilder("Attribute[");
- if (_namespaceURI.length() > 0) builder.append(_namespaceURI).append(" ");
+ if (namespaceURI.length() > 0) builder.append(namespaceURI).append(" ");
- builder.append(_name).append("=").append(_value).append("]");
+ builder.append(name).append("=").append(value).append("]");
return builder.toString();
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/BlockToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/BlockToken.java?rev=654133&r1=654132&r2=654133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/BlockToken.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/BlockToken.java Wed May 7 07:55:59 2008
@@ -21,7 +21,7 @@
*/
public class BlockToken extends TemplateToken
{
- private final String _id;
+ private final String id;
/**
* @param id the id of the block, or null for an anonymous block
@@ -31,7 +31,7 @@
{
super(TokenType.BLOCK, location);
- _id = id;
+ this.id = id;
}
/**
@@ -39,12 +39,12 @@
*/
public String getId()
{
- return _id;
+ return id;
}
@Override
public String toString()
{
- return String.format("Block[%s]", _id == null ? "" : _id);
+ return String.format("Block[%s]", id == null ? "" : id);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/CDATAToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/CDATAToken.java?rev=654133&r1=654132&r2=654133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/CDATAToken.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/CDATAToken.java Wed May 7 07:55:59 2008
@@ -21,23 +21,23 @@
*/
public class CDATAToken extends TemplateToken
{
- private final String _content;
+ private final String content;
public CDATAToken(String content, Location location)
{
super(TokenType.CDATA, location);
- _content = content;
+ this.content = content;
}
public String getContent()
{
- return _content;
+ return content;
}
@Override
public String toString()
{
- return String.format("CDATA[%s]", _content);
+ return String.format("CDATA[%s]", content);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/CommentToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/CommentToken.java?rev=654133&r1=654132&r2=654133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/CommentToken.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/CommentToken.java Wed May 7 07:55:59 2008
@@ -1,17 +1,17 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry.internal.parser;
import org.apache.tapestry.ioc.Location;
@@ -21,23 +21,23 @@
*/
public class CommentToken extends TemplateToken
{
- private final String _comment;
+ private final String comment;
public CommentToken(String comment, Location location)
{
super(TokenType.COMMENT, location);
- _comment = comment;
+ this.comment = comment;
}
public String getComment()
{
- return _comment;
+ return comment;
}
@Override
public String toString()
{
- return String.format("Comment[%s]", _comment);
+ return String.format("Comment[%s]", comment);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/ComponentTemplate.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/ComponentTemplate.java?rev=654133&r1=654132&r2=654133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/ComponentTemplate.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/ComponentTemplate.java Wed May 7 07:55:59 2008
@@ -40,8 +40,8 @@
List<TemplateToken> getTokens();
/**
- * Returns a set of strings corresponding to {@link StartComponentToken}s within the template that have a non-blank
- * id attribute.
+ * Returns a set of strings corresponding to {@link org.apache.tapestry.internal.parser.StartComponentToken}s within
+ * the template that have a non-blank id attribute.
*/
Set<String> getComponentIds();
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/ComponentTemplateImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/ComponentTemplateImpl.java?rev=654133&r1=654132&r2=654133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/ComponentTemplateImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/ComponentTemplateImpl.java Wed May 7 07:55:59 2008
@@ -23,38 +23,38 @@
public class ComponentTemplateImpl implements ComponentTemplate
{
- private final Resource _resource;
+ private final Resource resource;
- private final List<TemplateToken> _tokens;
+ private final List<TemplateToken> tokens;
- private final Set<String> _componentIds;
+ private final Set<String> componentIds;
/**
* @param resource the resource from which the template was parsed
* @param tokens the tokens of the template, a copy of this list will be made
- * @param componentIds TODO
+ * @param componentIds ids of components defined in the template
*/
public ComponentTemplateImpl(Resource resource, List<TemplateToken> tokens,
Set<String> componentIds)
{
- _resource = resource;
- _tokens = newList(tokens);
- _componentIds = newSet(componentIds);
+ this.resource = resource;
+ this.tokens = newList(tokens);
+ this.componentIds = newSet(componentIds);
}
public Resource getResource()
{
- return _resource;
+ return resource;
}
public List<TemplateToken> getTokens()
{
- return _tokens;
+ return tokens;
}
public Set<String> getComponentIds()
{
- return _componentIds;
+ return componentIds;
}
/**
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/DTDToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/DTDToken.java?rev=654133&r1=654132&r2=654133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/DTDToken.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/DTDToken.java Wed May 7 07:55:59 2008
@@ -23,19 +23,19 @@
*/
public class DTDToken extends TemplateToken
{
- private final String _name;
+ private final String name;
- private final String _publicId;
+ private final String publicId;
- private final String _systemId;
+ private final String systemId;
public DTDToken(String name, String publicId, String systemId, Location location)
{
super(TokenType.DTD, location);
- _name = name;
- _publicId = publicId;
- _systemId = systemId;
+ this.name = name;
+ this.publicId = publicId;
+ this.systemId = systemId;
}
/**
@@ -43,7 +43,7 @@
*/
public String getName()
{
- return _name;
+ return name;
}
/**
@@ -51,7 +51,7 @@
*/
public String getPublicId()
{
- return _publicId;
+ return publicId;
}
/**
@@ -59,12 +59,12 @@
*/
public String getSystemId()
{
- return _systemId;
+ return systemId;
}
@Override
public String toString()
{
- return String.format("DTD[name=%s; publicId=%s; systemId=%s]", _name, _publicId, _systemId);
+ return String.format("DTD[name=%s; publicId=%s; systemId=%s]", name, publicId, systemId);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/DefineNamespacePrefixToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/DefineNamespacePrefixToken.java?rev=654133&r1=654132&r2=654133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/DefineNamespacePrefixToken.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/DefineNamespacePrefixToken.java Wed May 7 07:55:59 2008
@@ -26,30 +26,30 @@
*/
public class DefineNamespacePrefixToken extends TemplateToken
{
- private final String _namespaceURI;
- private final String _namespacePrefix;
+ private final String namespaceURI;
+ private final String namespacePrefix;
public DefineNamespacePrefixToken(String namespaceURI, String namespacePrefix, Location location)
{
super(TokenType.DEFINE_NAMESPACE_PREFIX, location);
- _namespacePrefix = namespacePrefix;
- _namespaceURI = namespaceURI;
+ this.namespacePrefix = namespacePrefix;
+ this.namespaceURI = namespaceURI;
}
public String getNamespacePrefix()
{
- return _namespacePrefix;
+ return namespacePrefix;
}
public String getNamespaceURI()
{
- return _namespaceURI;
+ return namespaceURI;
}
@Override
public String toString()
{
- return String.format("DefineNamespacePrefix[%s=%s]", _namespacePrefix, _namespaceURI);
+ return String.format("DefineNamespacePrefix[%s=%s]", namespacePrefix, namespaceURI);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/ExpansionToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/ExpansionToken.java?rev=654133&r1=654132&r2=654133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/ExpansionToken.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/ExpansionToken.java Wed May 7 07:55:59 2008
@@ -23,23 +23,23 @@
*/
public class ExpansionToken extends TemplateToken
{
- private final String _expression;
+ private final String expression;
public ExpansionToken(String expression, Location location)
{
super(TokenType.EXPANSION, location);
- _expression = expression;
+ this.expression = expression;
}
public String getExpression()
{
- return _expression;
+ return expression;
}
@Override
public String toString()
{
- return String.format("Expression[%s]", _expression);
+ return String.format("Expression[%s]", expression);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/ParameterToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/ParameterToken.java?rev=654133&r1=654132&r2=654133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/ParameterToken.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/ParameterToken.java Wed May 7 07:55:59 2008
@@ -21,7 +21,7 @@
*/
public class ParameterToken extends TemplateToken
{
- private final String _name;
+ private final String name;
/**
* @param name the name of the parameter to be bound
@@ -31,17 +31,17 @@
{
super(TokenType.PARAMETER, location);
- _name = name;
+ this.name = name;
}
public String getName()
{
- return _name;
+ return name;
}
@Override
public String toString()
{
- return String.format("Parameter[%s]", _name);
+ return String.format("Parameter[%s]", name);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/StartComponentToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/StartComponentToken.java?rev=654133&r1=654132&r2=654133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/StartComponentToken.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/StartComponentToken.java Wed May 7 07:55:59 2008
@@ -23,13 +23,13 @@
*/
public class StartComponentToken extends TemplateToken
{
- private final String _elementName;
+ private final String elementName;
- private final String _id;
+ private final String id;
- private final String _componentType;
+ private final String componentType;
- private final String _mixins;
+ private final String mixins;
/**
* @param elementName the name of the element from which this component was parsed, or null if the element was the
@@ -46,10 +46,10 @@
// TODO: id or type may be null, but not both!
- _elementName = elementName;
- _id = id;
- _componentType = type;
- _mixins = mixins;
+ this.elementName = elementName;
+ this.id = id;
+ componentType = type;
+ this.mixins = mixins;
}
/**
@@ -61,7 +61,7 @@
*/
public String getElementName()
{
- return _elementName;
+ return elementName;
}
/**
@@ -70,7 +70,7 @@
*/
public String getId()
{
- return _id;
+ return id;
}
/**
@@ -79,7 +79,7 @@
*/
public String getComponentType()
{
- return _componentType;
+ return componentType;
}
@Override
@@ -87,10 +87,10 @@
{
StringBuilder builder = new StringBuilder();
- add(builder, "element", _elementName);
- add(builder, "id", _id);
- add(builder, "type", _componentType);
- add(builder, "mixins", _mixins);
+ add(builder, "element", elementName);
+ add(builder, "id", id);
+ add(builder, "type", componentType);
+ add(builder, "mixins", mixins);
builder.insert(0, "StartComponentToken[");
builder.append("]");
@@ -116,7 +116,7 @@
*/
public String getMixins()
{
- return _mixins;
+ return mixins;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/StartElementToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/StartElementToken.java?rev=654133&r1=654132&r2=654133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/StartElementToken.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/StartElementToken.java Wed May 7 07:55:59 2008
@@ -25,15 +25,16 @@
*/
public class StartElementToken extends TemplateToken
{
- private final String _namespaceURI;
- private final String _name;
+ private final String namespaceURI;
+
+ private final String name;
public StartElementToken(String namespaceURI, String name, Location location)
{
super(TokenType.START_ELEMENT, location);
- _namespaceURI = namespaceURI;
- _name = name;
+ this.namespaceURI = namespaceURI;
+ this.name = name;
}
/**
@@ -41,7 +42,7 @@
*/
public String getName()
{
- return _name;
+ return name;
}
/**
@@ -49,7 +50,7 @@
*/
public String getNamespaceURI()
{
- return _namespaceURI;
+ return namespaceURI;
}
@Override
@@ -57,9 +58,9 @@
{
StringBuilder builder = new StringBuilder("Start[");
- if (_namespaceURI.length() > 0) builder.append(_namespaceURI).append(" ");
+ if (namespaceURI.length() > 0) builder.append(namespaceURI).append(" ");
- builder.append(_name).append("]");
+ builder.append(name).append("]");
return builder.toString();
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/TemplateToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/TemplateToken.java?rev=654133&r1=654132&r2=654133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/TemplateToken.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/TemplateToken.java Wed May 7 07:55:59 2008
@@ -23,16 +23,16 @@
*/
public abstract class TemplateToken extends BaseLocatable
{
- private final TokenType _tokenType;
+ private final TokenType tokenType;
protected TemplateToken(TokenType tokenType, Location location)
{
super(location);
- _tokenType = tokenType;
+ this.tokenType = tokenType;
}
public TokenType getTokenType()
{
- return _tokenType;
+ return tokenType;
}
}