You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by jk...@apache.org on 2006/02/12 22:48:46 UTC
svn commit: r377248 - in /jakarta/tapestry/trunk:
examples/VlibBeans/src/java/org/apache/tapestry/vlib/ejb/
examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/fsmodel/
framework/src/java/org/apache/tapestry/ framework/src/java/org/...
Author: jkuhnert
Date: Sun Feb 12 13:48:44 2006
New Revision: 377248
URL: http://svn.apache.org/viewcvs?rev=377248&view=rev
Log:
I don't make the checkstyle rules, i just enforce them. take that ! only 1772 items left...
Modified:
jakarta/tapestry/trunk/examples/VlibBeans/src/java/org/apache/tapestry/vlib/ejb/Book.java
jakarta/tapestry/trunk/examples/VlibBeans/src/java/org/apache/tapestry/vlib/ejb/Person.java
jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/fsmodel/SFObject.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/RedirectFilter.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/components/LinkEventType.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/enhance/EnhancementOperationImpl.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/enhance/InjectMessagesWorker.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/FormSupportImpl.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/parse/SpecificationParser.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/record/PersistentPropertyDataEncoderImpl.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/script/IncludeScriptToken.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/script/ScriptParser.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ComponentMessagesSourceImpl.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/EngineManagerImpl.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/PropertyAccessorContribution.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ResponseRendererImpl.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/BeanSpecification.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/ComponentSpecification.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/ContainedComponent.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/ExtensionSpecification.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/NumberValidator.java
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectMessagesWorker.java
Modified: jakarta/tapestry/trunk/examples/VlibBeans/src/java/org/apache/tapestry/vlib/ejb/Book.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/VlibBeans/src/java/org/apache/tapestry/vlib/ejb/Book.java?rev=377248&r1=377247&r2=377248&view=diff
==============================================================================
--- jakarta/tapestry/trunk/examples/VlibBeans/src/java/org/apache/tapestry/vlib/ejb/Book.java (original)
+++ jakarta/tapestry/trunk/examples/VlibBeans/src/java/org/apache/tapestry/vlib/ejb/Book.java Sun Feb 12 13:48:44 2006
@@ -29,8 +29,6 @@
public class Book implements Serializable
{
- private static final long serialVersionUID = -3423550323411938995L;
-
/**
* Column index for the Book's primary key.
*/
@@ -79,7 +77,9 @@
public static final int N_COLUMNS = 14;
- private Object[] columns;
+ private static final long serialVersionUID = -3423550323411938995L;
+
+ private Object[] _columns;
/**
* Constructs a new BookQueryResult, making an internal copy of the columns passed.
@@ -93,13 +93,13 @@
if (columns.length != N_COLUMNS)
throw new IllegalArgumentException("Wrong number of columns for a Book.");
- this.columns = new Object[N_COLUMNS];
- System.arraycopy(columns, 0, this.columns, 0, N_COLUMNS);
+ this._columns = new Object[N_COLUMNS];
+ System.arraycopy(columns, 0, this._columns, 0, N_COLUMNS);
}
private Object get(int index)
{
- return columns[index];
+ return _columns[index];
}
public Integer getId()
@@ -200,4 +200,4 @@
return b.booleanValue();
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/examples/VlibBeans/src/java/org/apache/tapestry/vlib/ejb/Person.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/VlibBeans/src/java/org/apache/tapestry/vlib/ejb/Person.java?rev=377248&r1=377247&r2=377248&view=diff
==============================================================================
--- jakarta/tapestry/trunk/examples/VlibBeans/src/java/org/apache/tapestry/vlib/ejb/Person.java (original)
+++ jakarta/tapestry/trunk/examples/VlibBeans/src/java/org/apache/tapestry/vlib/ejb/Person.java Sun Feb 12 13:48:44 2006
@@ -25,10 +25,6 @@
public class Person implements Serializable
{
- private static final long serialVersionUID = 37148852625594728L;
-
- private Object[] columns;
-
public static final int ID_COLUMN = 0;
public static final int FIRST_NAME_COLUMN = 1;
@@ -44,7 +40,11 @@
public static final int LAST_ACCESS_COLUMN = 6;
public static final int N_COLUMNS = 7;
+
+ private static final long serialVersionUID = 37148852625594728L;
+ private Object[] _columns;
+
public Person(Object[] columns)
{
if (columns == null)
@@ -53,41 +53,41 @@
if (columns.length != N_COLUMNS)
throw new IllegalArgumentException("Wrong number of columns for a Person.");
- this.columns = new Object[N_COLUMNS];
- System.arraycopy(columns, 0, this.columns, 0, N_COLUMNS);
+ this._columns = new Object[N_COLUMNS];
+ System.arraycopy(columns, 0, this._columns, 0, N_COLUMNS);
}
public Integer getId()
{
- return (Integer) columns[ID_COLUMN];
+ return (Integer) _columns[ID_COLUMN];
}
public String getFirstName()
{
- return (String) columns[FIRST_NAME_COLUMN];
+ return (String) _columns[FIRST_NAME_COLUMN];
}
public String getLastName()
{
- return (String) columns[LAST_NAME_COLUMN];
+ return (String) _columns[LAST_NAME_COLUMN];
}
public String getEmail()
{
- return (String) columns[EMAIL_COLUMN];
+ return (String) _columns[EMAIL_COLUMN];
}
public String getNaturalName()
{
- if (columns[FIRST_NAME_COLUMN] == null)
- return (String) columns[LAST_NAME_COLUMN];
+ if (_columns[FIRST_NAME_COLUMN] == null)
+ return (String) _columns[LAST_NAME_COLUMN];
- return (String) columns[FIRST_NAME_COLUMN] + " " + (String) columns[LAST_NAME_COLUMN];
+ return (String) _columns[FIRST_NAME_COLUMN] + " " + (String) _columns[LAST_NAME_COLUMN];
}
public Timestamp getLastAccess()
{
- return (Timestamp) columns[LAST_ACCESS_COLUMN];
+ return (Timestamp) _columns[LAST_ACCESS_COLUMN];
}
public String toString()
@@ -96,13 +96,13 @@
buffer = new StringBuffer("Person[");
- if (columns[FIRST_NAME_COLUMN] != null)
+ if (_columns[FIRST_NAME_COLUMN] != null)
{
- buffer.append((String) columns[FIRST_NAME_COLUMN]);
+ buffer.append((String) _columns[FIRST_NAME_COLUMN]);
buffer.append(' ');
}
- buffer.append((String) columns[LAST_NAME_COLUMN]);
+ buffer.append((String) _columns[LAST_NAME_COLUMN]);
buffer.append(']');
return buffer.toString();
@@ -130,14 +130,14 @@
private void setBit(int column, boolean value)
{
- columns[column] = value ? Boolean.TRUE : Boolean.FALSE;
+ _columns[column] = value ? Boolean.TRUE : Boolean.FALSE;
}
private boolean getBit(int column)
{
- Boolean b = (Boolean) columns[column];
+ Boolean b = (Boolean) _columns[column];
return b.booleanValue();
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/fsmodel/SFObject.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/fsmodel/SFObject.java?rev=377248&r1=377247&r2=377248&view=diff
==============================================================================
--- jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/fsmodel/SFObject.java (original)
+++ jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/fsmodel/SFObject.java Sun Feb 12 13:48:44 2006
@@ -28,9 +28,9 @@
protected File m_objFile;
protected ITreeNode m_objParent;
- private Date m_objDate;
protected transient AssetsHolder m_objAssetsHolder = null;
-
+ private Date m_objDate;
+
public SFObject(ITreeNode objParent, File objFile)
{
m_objParent = objParent;
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/RedirectFilter.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/RedirectFilter.java?rev=377248&r1=377247&r2=377248&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/RedirectFilter.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/RedirectFilter.java Sun Feb 12 13:48:44 2006
@@ -47,10 +47,10 @@
public class RedirectFilter implements Filter
{
- private static final Log LOG = LogFactory.getLog(RedirectFilter.class);
-
public static final String REDIRECT_PATH_PARAM = "redirect-path";
+ private static final Log LOG = LogFactory.getLog(RedirectFilter.class);
+
private String _redirectPath;
public void init(FilterConfig config) throws ServletException
@@ -103,4 +103,4 @@
chain.doFilter(request, response);
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/components/LinkEventType.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/components/LinkEventType.java?rev=377248&r1=377247&r2=377248&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/components/LinkEventType.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/components/LinkEventType.java Sun Feb 12 13:48:44 2006
@@ -23,10 +23,6 @@
public class LinkEventType
{
- private final String _name;
-
- private final String _attributeName;
-
/**
* Type for <code>onMouseOver</code>. This may also be called "focus".
*/
@@ -71,6 +67,10 @@
public static final LinkEventType MOUSE_UP = new LinkEventType("MOUSE_UP", "onMouseUp");
+ private final String _name;
+
+ private final String _attributeName;
+
/**
* Constructs a new type of event. The name should match the static final variable (i.e.,
* MOUSE_OVER) and the attributeName is the name of the HTML attribute to be managed (i.e.,
@@ -100,4 +100,4 @@
{
return "LinkEventType[" + _name + "]";
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/enhance/EnhancementOperationImpl.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/enhance/EnhancementOperationImpl.java?rev=377248&r1=377247&r2=377248&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/enhance/EnhancementOperationImpl.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/enhance/EnhancementOperationImpl.java Sun Feb 12 13:48:44 2006
@@ -55,6 +55,8 @@
*/
public class EnhancementOperationImpl implements EnhancementOperation
{
+ static int _uid = 0;
+
private ClassResolver _resolver;
private IComponentSpecification _specification;
@@ -135,6 +137,16 @@
_log = log;
}
+ /**
+ * Alternate package private constructor used by the test suite, to bypass the defense checks
+ * above.
+ */
+
+ EnhancementOperationImpl()
+ {
+ _log = null;
+ }
+
public String toString()
{
ToStringBuilder builder = new ToStringBuilder(this);
@@ -223,16 +235,6 @@
}
}
- /**
- * Alternate package private constructor used by the test suite, to bypass the defense checks
- * above.
- */
-
- EnhancementOperationImpl()
- {
- _log = null;
- }
-
public void claimProperty(String propertyName)
{
Defense.notNull(propertyName, "propertyName");
@@ -506,8 +508,6 @@
return componentClass.getConstructors()[0];
}
- static int _uid = 0;
-
private String newClassName()
{
String baseName = _baseClass.getName();
@@ -658,4 +658,4 @@
{
return m != null && Modifier.isAbstract(m.getModifiers());
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/enhance/InjectMessagesWorker.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/enhance/InjectMessagesWorker.java?rev=377248&r1=377247&r2=377248&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/enhance/InjectMessagesWorker.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/enhance/InjectMessagesWorker.java Sun Feb 12 13:48:44 2006
@@ -34,15 +34,15 @@
*/
public class InjectMessagesWorker implements EnhancementWorker
{
- final String MESSAGES_PROPERTY = "messages";
+ final String _messagesProperty = "messages";
+ final MethodSignature _methodSignature = new MethodSignature(Messages.class, "getMessages",
+ null, null);
+
private ErrorLog _errorLog;
private ComponentMessagesSource _componentMessagesSource;
- final MethodSignature METHOD_SIGNATURE = new MethodSignature(Messages.class, "getMessages",
- null, null);
-
public void performEnhancement(EnhancementOperation op, IComponentSpecification spec)
{
Location location = spec.getLocation();
@@ -53,7 +53,7 @@
}
catch (Exception ex)
{
- _errorLog.error(EnhanceMessages.errorAddingProperty(MESSAGES_PROPERTY, op
+ _errorLog.error(EnhanceMessages.errorAddingProperty(_messagesProperty, op
.getBaseClass(), ex), location, ex);
}
}
@@ -62,7 +62,7 @@
{
Defense.notNull(op, "op");
- op.claimReadonlyProperty(MESSAGES_PROPERTY);
+ op.claimReadonlyProperty(_messagesProperty);
String sourceField = op.addInjectedField(
"_$componentMessagesSource",
@@ -78,7 +78,7 @@
builder.addln("return _$messages;");
builder.end();
- op.addMethod(Modifier.PUBLIC, METHOD_SIGNATURE, builder.toString(), location);
+ op.addMethod(Modifier.PUBLIC, _methodSignature, builder.toString(), location);
}
public void setComponentMessagesSource(ComponentMessagesSource componentMessagesSource)
@@ -90,4 +90,4 @@
{
_errorLog = errorLog;
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/FormSupportImpl.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/FormSupportImpl.java?rev=377248&r1=377247&r2=377248&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/FormSupportImpl.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/FormSupportImpl.java Sun Feb 12 13:48:44 2006
@@ -78,14 +78,14 @@
public static final String SCRIPT = "/org/apache/tapestry/form/Form.js";
- private final static Set _standardReservedIds;
-
/**
* Attribute set to true when a field has been focused; used to prevent conflicting JavaScript
* for field focusing from being emitted.
*/
public static final String FIELD_FOCUS_ATTRIBUTE = "org.apache.tapestry.field-focused";
+
+ private static final Set RESERVED_IDS;
static
{
@@ -97,10 +97,10 @@
set.add(SUBMIT_MODE);
set.add(FormConstants.SUBMIT_NAME_PARAMETER);
- _standardReservedIds = Collections.unmodifiableSet(set);
+ RESERVED_IDS = Collections.unmodifiableSet(set);
}
- private final static Set _submitModes;
+ private static final Set SUBMIT_MODES;
static
{
@@ -109,7 +109,7 @@
set.add(FormConstants.SUBMIT_NORMAL);
set.add(FormConstants.SUBMIT_REFRESH);
- _submitModes = Collections.unmodifiableSet(set);
+ SUBMIT_MODES = Collections.unmodifiableSet(set);
}
/**
@@ -253,7 +253,7 @@
// Reserve the name.
- if (!_standardReservedIds.contains(name))
+ if (!RESERVED_IDS.contains(name))
{
_elementIdAllocator.allocateId(name);
@@ -579,7 +579,7 @@
runDeferredRunnables();
- if (_submitModes.contains(mode))
+ if (SUBMIT_MODES.contains(mode))
return mode;
// Either something wacky on the client side, or a client without
@@ -739,4 +739,4 @@
_delegate.registerForFocus(field, priority);
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/parse/SpecificationParser.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/parse/SpecificationParser.java?rev=377248&r1=377247&r2=377248&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/parse/SpecificationParser.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/parse/SpecificationParser.java Sun Feb 12 13:48:44 2006
@@ -73,9 +73,9 @@
*/
public class SpecificationParser extends AbstractParser implements ISpecificationParser
{
- private static final String IDENTIFIER_PATTERN = "_?[a-zA-Z]\\w*";
+ public static final String IDENTIFIER_PATTERN = "_?[a-zA-Z]\\w*";
- private static final String EXTENDED_IDENTIFIER_PATTERN = "_?[a-zA-Z](\\w|-)*";
+ public static final String EXTENDED_IDENTIFIER_PATTERN = "_?[a-zA-Z](\\w|-)*";
/**
* Perl5 pattern for asset names. Letter, followed by letter, number or underscore. Also allows
@@ -128,13 +128,6 @@
+ IDENTIFIER_PATTERN + "/)*" + IDENTIFIER_PATTERN + "$";
/**
- * We can share a single map for all the XML attribute to object conversions, since the keys are
- * unique.
- */
-
- private final Map CONVERSION_MAP = new HashMap();
-
- /**
* Extended version of {@link Tapestry.SIMPLE_PROPERTY_NAME_PATTERN}, but allows a series of
* individual property names, seperated by periods. In addition, each name within the dotted
* sequence is allowed to contain dashes.
@@ -161,21 +154,7 @@
*/
public static final String LIBRARY_ID_PATTERN = Tapestry.SIMPLE_PROPERTY_NAME_PATTERN;
-
- /** @since 4.0 */
- private final Log _log;
-
- /** @since 4.0 */
- private final ErrorHandler _errorHandler;
-
- /**
- * Set to true if parsing the 4.0 DTD.
- *
- * @since 4.0
- */
-
- private boolean _DTD_4_0;
-
+
/**
* Perl5 pattern for page names. Page names appear in library and application specifications, in
* the <page> element. Starting with 4.0, the page name may look more like a path name,
@@ -216,7 +195,15 @@
*/
public static final String SERVICE_NAME_PATTERN = EXTENDED_PROPERTY_NAME_PATTERN;
+
+ /** @since 3.0 */
+ public static final String TAPESTRY_DTD_3_0_PUBLIC_ID = "-//Apache Software Foundation//Tapestry Specification 3.0//EN";
+
+ /** @since 4.0 */
+
+ public static final String TAPESTRY_DTD_4_0_PUBLIC_ID = "-//Apache Software Foundation//Tapestry Specification 4.0//EN";
+
private static final int STATE_ALLOW_DESCRIPTION = 2000;
private static final int STATE_ALLOW_PROPERTY = 2001;
@@ -225,7 +212,7 @@
private static final int STATE_BEAN = 4;
- /** Very different between 3.0 and 4.0 DTD */
+ /** Very different between 3.0 and 4.0 DTD. */
private static final int STATE_BINDING_3_0 = 7;
@@ -263,17 +250,31 @@
private static final int STATE_SET = 5;
- /** 3.0 DTD only */
+ /** 3.0 DTD only. */
private static final int STATE_STATIC_BINDING = 9;
- /** @since 3.0 */
+ /**
+ * We can share a single map for all the XML attribute to object conversions, since the keys are
+ * unique.
+ */
- public static final String TAPESTRY_DTD_3_0_PUBLIC_ID = "-//Apache Software Foundation//Tapestry Specification 3.0//EN";
+ private final Map _conversionMap = new HashMap();
+
/** @since 4.0 */
+ private final Log _log;
- public static final String TAPESTRY_DTD_4_0_PUBLIC_ID = "-//Apache Software Foundation//Tapestry Specification 4.0//EN";
+ /** @since 4.0 */
+ private final ErrorHandler _errorHandler;
+
+ /**
+ * Set to true if parsing the 4.0 DTD.
+ *
+ * @since 4.0
+ */
+ private boolean _dtd40;
+
/**
* The attributes of the current element, as a map (string keyed on string).
*/
@@ -324,26 +325,26 @@
{
- CONVERSION_MAP.put("true", Boolean.TRUE);
- CONVERSION_MAP.put("t", Boolean.TRUE);
- CONVERSION_MAP.put("1", Boolean.TRUE);
- CONVERSION_MAP.put("y", Boolean.TRUE);
- CONVERSION_MAP.put("yes", Boolean.TRUE);
- CONVERSION_MAP.put("on", Boolean.TRUE);
- CONVERSION_MAP.put("aye", Boolean.TRUE);
-
- CONVERSION_MAP.put("false", Boolean.FALSE);
- CONVERSION_MAP.put("f", Boolean.FALSE);
- CONVERSION_MAP.put("0", Boolean.FALSE);
- CONVERSION_MAP.put("off", Boolean.FALSE);
- CONVERSION_MAP.put("no", Boolean.FALSE);
- CONVERSION_MAP.put("n", Boolean.FALSE);
- CONVERSION_MAP.put("nay", Boolean.FALSE);
-
- CONVERSION_MAP.put("none", BeanLifecycle.NONE);
- CONVERSION_MAP.put("request", BeanLifecycle.REQUEST);
- CONVERSION_MAP.put("page", BeanLifecycle.PAGE);
- CONVERSION_MAP.put("render", BeanLifecycle.RENDER);
+ _conversionMap.put("true", Boolean.TRUE);
+ _conversionMap.put("t", Boolean.TRUE);
+ _conversionMap.put("1", Boolean.TRUE);
+ _conversionMap.put("y", Boolean.TRUE);
+ _conversionMap.put("yes", Boolean.TRUE);
+ _conversionMap.put("on", Boolean.TRUE);
+ _conversionMap.put("aye", Boolean.TRUE);
+
+ _conversionMap.put("false", Boolean.FALSE);
+ _conversionMap.put("f", Boolean.FALSE);
+ _conversionMap.put("0", Boolean.FALSE);
+ _conversionMap.put("off", Boolean.FALSE);
+ _conversionMap.put("no", Boolean.FALSE);
+ _conversionMap.put("n", Boolean.FALSE);
+ _conversionMap.put("nay", Boolean.FALSE);
+
+ _conversionMap.put("none", BeanLifecycle.NONE);
+ _conversionMap.put("request", BeanLifecycle.REQUEST);
+ _conversionMap.put("page", BeanLifecycle.PAGE);
+ _conversionMap.put("render", BeanLifecycle.RENDER);
_parserFactory.setNamespaceAware(false);
_parserFactory.setValidating(true);
@@ -476,7 +477,7 @@
private void allowMetaData()
{
- if (_DTD_4_0)
+ if (_dtd40)
{
if (_elementName.equals("meta"))
{
@@ -486,7 +487,7 @@
}
else if (_elementName.equals("property"))
{
- enterProperty_3_0();
+ enterProperty3();
return;
}
@@ -522,13 +523,13 @@
if (_elementName.equals("set-property"))
{
- enterSetProperty_3_0();
+ enterSetProperty3();
return;
}
if (_elementName.equals("set-message-property"))
{
- enterSetMessage_3_0();
+ enterSetMessage3();
return;
}
@@ -553,19 +554,19 @@
if (_elementName.equals("static-binding"))
{
- enterStaticBinding_3_0();
+ enterStaticBinding3();
return;
}
if (_elementName.equals("message-binding"))
{
- enterMessageBinding_3_0();
+ enterMessageBinding3();
return;
}
if (_elementName.equals("inherited-binding"))
{
- enterInheritedBinding_3_0();
+ enterInheritedBinding3();
return;
}
@@ -655,7 +656,7 @@
if (_elementName.equals("service"))
{
- enterService_3_0();
+ enterService3();
return;
}
@@ -703,7 +704,7 @@
// Have to be careful, because <meta> in 4.0 was <property> in 3.0
if (_elementName.equals("property-specification")
- || (_DTD_4_0 && _elementName.equals("property")))
+ || (_dtd40 && _elementName.equals("property")))
{
enterProperty();
return;
@@ -729,19 +730,19 @@
if (_elementName.equals("context-asset"))
{
- enterContextAsset_3_0();
+ enterContextAsset3();
return;
}
if (_elementName.equals("private-asset"))
{
- enterPrivateAsset_3_0();
+ enterPrivateAsset3();
return;
}
if (_elementName.equals("external-asset"))
{
- enterExternalAsset_3_0();
+ enterExternalAsset3();
return;
}
@@ -832,7 +833,7 @@
case STATE_BINDING_3_0:
- endBinding_3_0();
+ endBinding3();
break;
case STATE_BINDING:
@@ -869,7 +870,7 @@
pop();
}
- private void endBinding_3_0()
+ private void endBinding3()
{
BindingSetter bs = (BindingSetter) peekObject();
@@ -928,7 +929,7 @@
// In the 3.0 DTD, the initial value was always an OGNL expression.
// In the 4.0 DTD, it is a binding reference, qualified with a prefix.
- if (initialValue != null && !_DTD_4_0)
+ if (initialValue != null && !_dtd40)
initialValue = BindingConstants.OGNL_PREFIX + ":" + initialValue;
ps.setInitialValue(initialValue);
@@ -1019,9 +1020,9 @@
private void enterBinding()
{
- if (!_DTD_4_0)
+ if (!_dtd40)
{
- enterBinding_3_0();
+ enterBinding3();
return;
}
@@ -1058,7 +1059,7 @@
* Handles a binding in a 3.0 DTD.
*/
- private void enterBinding_3_0()
+ private void enterBinding3()
{
String name = getAttribute("name");
String expression = getAttribute("expression");
@@ -1134,7 +1135,7 @@
private void enterConfigure()
{
- String attributeName = _DTD_4_0 ? "property" : "property-name";
+ String attributeName = _dtd40 ? "property" : "property-name";
String propertyName = getValidatedAttribute(
attributeName,
@@ -1151,7 +1152,7 @@
push(_elementName, setter, STATE_CONFIGURE, false);
}
- private void enterContextAsset_3_0()
+ private void enterContextAsset3()
{
enterAsset("path", "context:");
}
@@ -1197,7 +1198,7 @@
push(_elementName, es, STATE_EXTENSION);
}
- private void enterExternalAsset_3_0()
+ private void enterExternalAsset3()
{
// External URLs get no prefix, but will have a scheme (i.e., "http:") that
// fulfils much the same purpose.
@@ -1205,9 +1206,9 @@
enterAsset("URL", null);
}
- /** A throwback to the 3.0 DTD */
+ /** A throwback to the 3.0 DTD. */
- private void enterInheritedBinding_3_0()
+ private void enterInheritedBinding3()
{
String name = getAttribute("name");
String parameterName = getAttribute("parameter-name");
@@ -1247,7 +1248,7 @@
push(_elementName, null, STATE_LISTENER_BINDING, false);
}
- private void enterMessageBinding_3_0()
+ private void enterMessageBinding3()
{
String name = getAttribute("name");
String key = getAttribute("key");
@@ -1285,7 +1286,7 @@
PARAMETER_NAME_PATTERN,
"invalid-parameter-name");
- String attributeName = _DTD_4_0 ? "property" : "property-name";
+ String attributeName = _dtd40 ? "property" : "property-name";
String propertyName = getValidatedAttribute(
attributeName,
@@ -1306,12 +1307,12 @@
String defaultValue = getAttribute("default-value");
- if (defaultValue != null && !_DTD_4_0)
+ if (defaultValue != null && !_dtd40)
defaultValue = BindingConstants.OGNL_PREFIX + ":" + defaultValue;
ps.setDefaultValue(defaultValue);
- if (!_DTD_4_0)
+ if (!_dtd40)
{
// When direction=auto (in a 3.0 DTD), turn caching off
@@ -1345,7 +1346,7 @@
push(_elementName, ps, STATE_ALLOW_DESCRIPTION);
}
- private void enterPrivateAsset_3_0()
+ private void enterPrivateAsset3()
{
enterAsset("resource-path", "classpath:");
}
@@ -1363,7 +1364,7 @@
push(_elementName, new PropertyValueSetter(ph, key, value), STATE_META, false);
}
- private void enterProperty_3_0()
+ private void enterProperty3()
{
String name = getAttribute("name");
String value = getAttribute("value");
@@ -1376,7 +1377,7 @@
}
/**
- * &tl;property> in 4.0, or <property-specification> in 3.0
+ * &tl;property> in 4.0, or <property-specification> in 3.0 .
*/
private void enterProperty()
@@ -1386,7 +1387,7 @@
String persistence = null;
- if (_DTD_4_0)
+ if (_dtd40)
persistence = getAttribute("persist");
else
persistence = getBooleanAttribute("persistent", false) ? "session" : null;
@@ -1443,14 +1444,14 @@
push(_elementName, null, STATE_NO_CONTENT);
}
- private void enterService_3_0()
+ private void enterService3()
{
_errorHandler.error(_log, ParseMessages.serviceElementNotSupported(), getLocation(), null);
push(_elementName, null, STATE_NO_CONTENT);
}
- private void enterSetMessage_3_0()
+ private void enterSetMessage3()
{
String name = getAttribute("name");
String key = getAttribute("key");
@@ -1482,7 +1483,7 @@
push(_elementName, new BeanSetPropertySetter(bs, bi, null, reference), STATE_SET, false);
}
- private void enterSetProperty_3_0()
+ private void enterSetProperty3()
{
String name = getAttribute("name");
String expression = getAttribute("expression");
@@ -1497,7 +1498,7 @@
expression), STATE_SET, false);
}
- private void enterStaticBinding_3_0()
+ private void enterStaticBinding3()
{
String name = getAttribute("name");
String expression = getAttribute("value");
@@ -1532,7 +1533,7 @@
if (value == null)
return defaultValue;
- Boolean b = (Boolean) CONVERSION_MAP.get(value);
+ Boolean b = (Boolean) _conversionMap.get(value);
return b.booleanValue();
}
@@ -1544,7 +1545,7 @@
if (key == null)
return defaultValue;
- return CONVERSION_MAP.get(key);
+ return _conversionMap.get(key);
}
private InputSource getDTDInputSource(String name)
@@ -1733,7 +1734,7 @@
protected void resetParser()
{
_rootObject = null;
- _DTD_4_0 = false;
+ _dtd40 = false;
_attributes.clear();
}
@@ -1746,7 +1747,7 @@
{
if (TAPESTRY_DTD_4_0_PUBLIC_ID.equals(publicId))
{
- _DTD_4_0 = true;
+ _dtd40 = true;
return getDTDInputSource("Tapestry_4_0.dtd");
}
@@ -1768,4 +1769,4 @@
{
_valueConverter = valueConverter;
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/record/PersistentPropertyDataEncoderImpl.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/record/PersistentPropertyDataEncoderImpl.java?rev=377248&r1=377247&r2=377248&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/record/PersistentPropertyDataEncoderImpl.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/record/PersistentPropertyDataEncoderImpl.java Sun Feb 12 13:48:44 2006
@@ -50,8 +50,6 @@
*/
public class PersistentPropertyDataEncoderImpl implements PersistentPropertyDataEncoder
{
- private ClassResolver _classResolver;
-
/**
* Prefix on the MIME encoding that indicates that the encoded data is not encoded.
*/
@@ -64,6 +62,8 @@
public static final String GZIP_BYTESTREAM_PREFIX = "Z";
+ private ClassResolver _classResolver;
+
public String encodePageChanges(List changes)
{
Defense.notNull(changes, "changes");
@@ -193,4 +193,4 @@
{
_classResolver = resolver;
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/script/IncludeScriptToken.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/script/IncludeScriptToken.java?rev=377248&r1=377247&r2=377248&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/script/IncludeScriptToken.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/script/IncludeScriptToken.java Sun Feb 12 13:48:44 2006
@@ -14,9 +14,9 @@
package org.apache.tapestry.script;
-import org.apache.hivemind.util.ClasspathResource;
import org.apache.hivemind.Location;
import org.apache.hivemind.Resource;
+import org.apache.hivemind.util.ClasspathResource;
/**
* A token for included scripts.
@@ -59,4 +59,4 @@
session.addExternalScript(includeLocation);
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/script/ScriptParser.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/script/ScriptParser.java?rev=377248&r1=377247&r2=377248&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/script/ScriptParser.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/script/ScriptParser.java Sun Feb 12 13:48:44 2006
@@ -50,8 +50,6 @@
public class ScriptParser
{
- private RuleDirectedParser _parser;
-
public static final String SCRIPT_DTD_1_0_PUBLIC_ID = "-//Primix Solutions//Tapestry Script 1.0//EN";
public static final String SCRIPT_DTD_1_1_PUBLIC_ID = "-//Howard Ship//Tapestry Script 1.1//EN";
@@ -61,6 +59,8 @@
/** @since 3.0 */
public static final String SCRIPT_DTD_3_0_PUBLIC_ID = "-//Apache Software Foundation//Tapestry Script Specification 3.0//EN";
+ private RuleDirectedParser _parser;
+
public ScriptParser(ClassResolver resolver, ExpressionEvaluator evaluator,
ValueConverter valueConverter)
{
@@ -105,4 +105,4 @@
return (IScript) _parser.parse(resourceLocation);
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ComponentMessagesSourceImpl.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ComponentMessagesSourceImpl.java?rev=377248&r1=377247&r2=377248&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ComponentMessagesSourceImpl.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ComponentMessagesSourceImpl.java Sun Feb 12 13:48:44 2006
@@ -48,18 +48,17 @@
public class ComponentMessagesSourceImpl implements ComponentMessagesSource, ResetEventListener
{
-
- private Properties _emptyProperties = new Properties();
-
- private static final String SUFFIX = ".properties";
-
/**
* The name of the component/application/etc property that will be used to
- * determine the encoding to use when loading the messages
+ * determine the encoding to use when loading the messages.
*/
public static final String MESSAGES_ENCODING_PROPERTY_NAME = "org.apache.tapestry.messages-encoding";
+ private static final String SUFFIX = ".properties";
+
+ private Properties _emptyProperties = new Properties();
+
/**
* Map of Maps. The outer map is keyed on component specification location
* (a{@link Resource}. This inner map is keyed on locale and the value is
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/EngineManagerImpl.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/EngineManagerImpl.java?rev=377248&r1=377247&r2=377248&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/EngineManagerImpl.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/EngineManagerImpl.java Sun Feb 12 13:48:44 2006
@@ -19,8 +19,8 @@
import org.apache.tapestry.IEngine;
import org.apache.tapestry.services.EngineFactory;
import org.apache.tapestry.services.EngineManager;
-import org.apache.tapestry.services.RequestLocaleManager;
import org.apache.tapestry.services.ObjectPool;
+import org.apache.tapestry.services.RequestLocaleManager;
/**
* Implementation of service {@link org.apache.tapestry.services.EngineManager}.
@@ -72,4 +72,4 @@
{
_localeManager = manager;
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/PropertyAccessorContribution.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/PropertyAccessorContribution.java?rev=377248&r1=377247&r2=377248&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/PropertyAccessorContribution.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/PropertyAccessorContribution.java Sun Feb 12 13:48:44 2006
@@ -14,10 +14,10 @@
package org.apache.tapestry.services.impl;
-import org.apache.hivemind.impl.BaseLocatable;
-
import ognl.PropertyAccessor;
+import org.apache.hivemind.impl.BaseLocatable;
+
/**
* A contribution to the <code>tapestry.ognl.PropertyAccessors</code> configuration point; this
* provides the Class and {@link ognl.PropertyAccessor}that will be passed to
@@ -51,4 +51,4 @@
{
_subjectClass = subjectClass;
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ResponseRendererImpl.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ResponseRendererImpl.java?rev=377248&r1=377247&r2=377248&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ResponseRendererImpl.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ResponseRendererImpl.java Sun Feb 12 13:48:44 2006
@@ -34,12 +34,6 @@
*/
public class ResponseRendererImpl implements ResponseRenderer
{
- private RequestLocaleManager _localeManager;
-
- private MarkupWriterSource _markupWriterSource;
-
- private WebResponse _webResponse;
-
/**
* Inside a {@link org.apache.tapestry.util.ContentType}, the output encoding is called
* "charset".
@@ -47,6 +41,12 @@
public static final String ENCODING_KEY = "charset";
+ private RequestLocaleManager _localeManager;
+
+ private MarkupWriterSource _markupWriterSource;
+
+ private WebResponse _webResponse;
+
public void renderResponse(IRequestCycle cycle) throws IOException
{
_localeManager.persistLocale();
@@ -87,4 +87,4 @@
{
_webResponse = webResponse;
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/BeanSpecification.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/BeanSpecification.java?rev=377248&r1=377247&r2=377248&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/BeanSpecification.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/BeanSpecification.java Sun Feb 12 13:48:44 2006
@@ -28,10 +28,16 @@
public class BeanSpecification extends LocatablePropertyHolder implements IBeanSpecification
{
- protected String className;
+ protected String _className;
- protected BeanLifecycle lifecycle;
+ protected BeanLifecycle _lifecycle;
+ /**
+ * A List of {@link IBeanInitializer}.
+ */
+
+ protected List initializers;
+
/** @since 1.0.9 * */
private String description;
@@ -39,20 +45,14 @@
private String _propertyName;
- /**
- * A List of {@link IBeanInitializer}.
- */
-
- protected List initializers;
-
public String getClassName()
{
- return className;
+ return _className;
}
public BeanLifecycle getLifecycle()
{
- return lifecycle;
+ return _lifecycle;
}
/**
@@ -83,9 +83,9 @@
{
StringBuffer buffer = new StringBuffer("BeanSpecification[");
- buffer.append(className);
+ buffer.append(_className);
buffer.append(", lifecycle ");
- buffer.append(lifecycle.getName());
+ buffer.append(_lifecycle.getName());
if (initializers != null && initializers.size() > 0)
{
@@ -113,14 +113,14 @@
public void setClassName(String className)
{
- this.className = className;
+ this._className = className;
}
/** @since 3.0 * */
public void setLifecycle(BeanLifecycle lifecycle)
{
- this.lifecycle = lifecycle;
+ this._lifecycle = lifecycle;
}
/** @since 4.0 */
@@ -134,4 +134,4 @@
{
_propertyName = propertyName;
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/ComponentSpecification.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/ComponentSpecification.java?rev=377248&r1=377247&r2=377248&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/ComponentSpecification.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/ComponentSpecification.java Sun Feb 12 13:48:44 2006
@@ -58,12 +58,6 @@
public class ComponentSpecification extends LocatablePropertyHolder implements
IComponentSpecification
{
- private String _componentClassName;
-
- /** @since 1.0.9 * */
-
- private String _description;
-
/**
* Keyed on component id, value is {@link IContainedComponent}.
*/
@@ -100,6 +94,12 @@
protected Set _reservedParameterNames;
+ private String _componentClassName;
+
+ /** @since 1.0.9 * */
+
+ private String _description;
+
/**
* Is the component allowed to have a body (that is, wrap other elements?).
*/
@@ -292,7 +292,7 @@
}
/**
- * Returns a <code>List</code> of the String names of all assets, in alphabetical order
+ * Returns a <code>List</code> of the String names of all assets, in alphabetical order.
*/
public List getAssetNames()
@@ -697,4 +697,4 @@
return Collections.unmodifiableSet(_reservedParameterNames);
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/ContainedComponent.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/ContainedComponent.java?rev=377248&r1=377247&r2=377248&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/ContainedComponent.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/ContainedComponent.java Sun Feb 12 13:48:44 2006
@@ -28,16 +28,16 @@
public class ContainedComponent extends LocatablePropertyHolder implements IContainedComponent
{
+ private static final int MAP_SIZE = 3;
+
+ protected Map bindings;
+
private String type;
private String copyOf;
private boolean inheritInformalParameters;
- protected Map bindings;
-
- private static final int MAP_SIZE = 3;
-
/** @since 4.0 */
private String _propertyName;
@@ -137,4 +137,4 @@
{
_propertyName = propertyName;
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/ExtensionSpecification.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/ExtensionSpecification.java?rev=377248&r1=377247&r2=377248&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/ExtensionSpecification.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/ExtensionSpecification.java Sun Feb 12 13:48:44 2006
@@ -40,9 +40,9 @@
{
private static final Log LOG = LogFactory.getLog(ExtensionSpecification.class);
- private String _className;
-
protected Map _configuration = new HashMap();
+
+ private String _className;
private boolean _immediate;
@@ -150,16 +150,17 @@
private Object instantiateInstance(Class extensionClass, Object result)
{
+ Object ret = null;
try
{
- result = extensionClass.newInstance();
+ ret = extensionClass.newInstance();
}
catch (Exception ex)
{
throw new ApplicationRuntimeException(ex.getMessage(), getLocation(), ex);
}
-
- return result;
+
+ return ret;
}
public String toString()
@@ -196,4 +197,4 @@
_immediate = immediate;
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/NumberValidator.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/NumberValidator.java?rev=377248&r1=377247&r2=377248&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/NumberValidator.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/NumberValidator.java Sun Feb 12 13:48:44 2006
@@ -38,9 +38,14 @@
public class NumberValidator extends AbstractNumericValidator
{
+ public static final int NUMBER_TYPE_INTEGER = 0;
+ public static final int NUMBER_TYPE_REAL = 1;
+
private static final Map TYPES = new HashMap();
-
+
+ private static StrategyRegistry _numberAdaptors = new StrategyRegistryImpl();
+
static
{
TYPES.put("boolean", boolean.class);
@@ -77,17 +82,11 @@
private Number _maximum;
- private static StrategyRegistry _numberAdaptors = new StrategyRegistryImpl();
-
- public final static int NUMBER_TYPE_INTEGER = 0;
-
- public final static int NUMBER_TYPE_REAL = 1;
-
/**
* This class is not meant for use outside of NumberValidator; it is public
* only to fascilitate some unit testing.
*/
- public static abstract class NumberStrategy
+ public abstract static class NumberStrategy
{
/**
@@ -98,7 +97,7 @@
* if the String can not be parsed.
*/
- abstract public Number parse(String value);
+ public abstract Number parse(String value);
/**
* Indicates the type of the number represented -- integer or real. The
@@ -108,14 +107,14 @@
*
* @return one of the predefined number types
*/
- abstract public int getNumberType();
+ public abstract int getNumberType();
public int compare(Number left, Number right)
{
if (!left.getClass().equals(right.getClass())) right = coerce(right);
-
+
Comparable lc = (Comparable)left;
-
+
return lc.compareTo(right);
}
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectMessagesWorker.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectMessagesWorker.java?rev=377248&r1=377247&r2=377248&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectMessagesWorker.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectMessagesWorker.java Sun Feb 12 13:48:44 2006
@@ -50,7 +50,7 @@
MockControl control = newControl(EnhancementOperation.class);
EnhancementOperation op = (EnhancementOperation) control.getMock();
- op.claimReadonlyProperty(w.MESSAGES_PROPERTY);
+ op.claimReadonlyProperty(w._messagesProperty);
op.addInjectedField("_$componentMessagesSource", ComponentMessagesSource.class, source);
control.setReturnValue("fred");
@@ -62,7 +62,7 @@
builder.end();
op.addField("_$messages", Messages.class);
- op.addMethod(Modifier.PUBLIC, w.METHOD_SIGNATURE, builder.toString(), l);
+ op.addMethod(Modifier.PUBLIC, w._methodSignature, builder.toString(), l);
replayControls();
@@ -79,14 +79,14 @@
InjectMessagesWorker w = new InjectMessagesWorker();
Throwable ex = new ApplicationRuntimeException(EnhanceMessages
- .claimedProperty(w.MESSAGES_PROPERTY));
+ .claimedProperty(w._messagesProperty));
IComponentSpecification spec = newSpec(l);
MockControl control = newControl(EnhancementOperation.class);
EnhancementOperation op = (EnhancementOperation) control.getMock();
- op.claimReadonlyProperty(w.MESSAGES_PROPERTY);
+ op.claimReadonlyProperty(w._messagesProperty);
control.setThrowable(ex);
op.getBaseClass();
@@ -95,7 +95,7 @@
ErrorLog log = (ErrorLog) newMock(ErrorLog.class);
log.error(
- EnhanceMessages.errorAddingProperty(w.MESSAGES_PROPERTY, BaseComponent.class, ex),
+ EnhanceMessages.errorAddingProperty(w._messagesProperty, BaseComponent.class, ex),
l,
ex);
---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org