Author: jkuhnert
Date: Sat Mar 18 13:51:27 2006
New Revision: 386886
URL: http://svn.apache.org/viewcvs?rev=386886&view=rev
Log:
Checkstyle cleanups
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/bean/EvenOdd.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/bean/IBeanInitializer.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/ExpressionBinding.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/HiveMindBinding.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/HiveMindBindingFactory.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/ListenerBindingFactory.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/ListenerMethodBinding.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/LiteralBinding.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/LiteralBindingFactory.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/MessageBinding.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/MessageBindingFactory.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/OGNLBindingFactory.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/StateBinding.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/StateBindingFactory.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/callback/DirectCallback.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/callback/ExternalCallback.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/callback/ICallback.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/callback/PageCallback.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/IteratorToListConverter.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/MapToBooleanConverter.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/NullToBooleanConverter.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/NullToIteratorConverter.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/NullToListConverter.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/NumberToBooleanConverter.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/ObjectArrayToIteratorConverter.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/ObjectArrayToListConverter.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/ObjectToStringConverter.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/StringConvertedPropertySelectionModel.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/StringToBooleanConverter.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/TypeConverter.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/TypeConverterContribution.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/TypeConverterWrapper.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/ValueConverter.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/ValueConverterImpl.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/components/Delegator.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/parse/TemplateParser.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/parse/TemplateToken.java
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/junit/parse/NamespaceAttributeName.html
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/junit/parse/TestTemplateParser.java
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/bean/EvenOdd.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/bean/EvenOdd.java?rev=386886&r1=386885&r2=386886&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/bean/EvenOdd.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/bean/EvenOdd.java
Sat Mar 18 13:51:27 2006
@@ -15,24 +15,23 @@
package org.apache.tapestry.bean;
/**
- * Used to emit a stream of alterating string values: "even", "odd", etc.
This
- * is often used in the Inspector pages to make the class of a <tr>
alternate
- * for presentation reasons.
- *
- * @author Howard Lewis Ship
- *
- **/
+ * Used to emit a stream of alterating string values: "even", "odd", etc. This
+ * is often used in the Inspector pages to make the class of a <tr>
+ * alternate for presentation reasons.
+ *
+ * @author Howard Lewis Ship
+ */
public class EvenOdd
{
+
private boolean even = true;
/**
- * Returns "even" or "odd". Whatever it returns on one invocation, it
will
- * return the opposite on the next. By default, the first value
- * returned is "even".
- *
- **/
+ * Returns "even" or "odd". Whatever it returns on one invocation, it will
+ * return the opposite on the next. By default, the first value returned is
+ * "even".
+ */
public String getNext()
{
@@ -42,19 +41,18 @@
return result;
}
-
+
public boolean isEven()
{
return even;
}
- /**
- * Overrides the even flag.
- *
- **/
-
+ /**
+ * Overrides the even flag.
+ */
+
public void setEven(boolean value)
{
even = value;
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/bean/IBeanInitializer.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/bean/IBeanInitializer.java?rev=386886&r1=386885&r2=386886&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/bean/IBeanInitializer.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/bean/IBeanInitializer.java
Sat Mar 18 13:51:27 2006
@@ -33,7 +33,7 @@
*
**/
- public void setBeanProperty(IBeanProvider provider, Object bean);
+ void setBeanProperty(IBeanProvider provider, Object bean);
/**
* Returns the name of the property this initializer
@@ -41,5 +41,5 @@
*
**/
- public String getPropertyName();
-}
\ No newline at end of file
+ String getPropertyName();
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/ExpressionBinding.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/ExpressionBinding.java?rev=386886&r1=386885&r2=386886&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/ExpressionBinding.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/ExpressionBinding.java
Sat Mar 18 13:51:27 2006
@@ -206,4 +206,4 @@
{
return _root;
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/HiveMindBinding.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/HiveMindBinding.java?rev=386886&r1=386885&r2=386886&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/HiveMindBinding.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/HiveMindBinding.java
Sat Mar 18 13:51:27 2006
@@ -49,4 +49,4 @@
return _provider.obtainValue(_objectReference, getLocation());
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/HiveMindBindingFactory.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/HiveMindBindingFactory.java?rev=386886&r1=386885&r2=386886&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/HiveMindBindingFactory.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/HiveMindBindingFactory.java
Sat Mar 18 13:51:27 2006
@@ -40,4 +40,4 @@
{
_injectedValueProvider = provider;
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/ListenerBindingFactory.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/ListenerBindingFactory.java?rev=386886&r1=386885&r2=386886&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/ListenerBindingFactory.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/ListenerBindingFactory.java
Sat Mar 18 13:51:27 2006
@@ -35,4 +35,4 @@
expression);
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/ListenerMethodBinding.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/ListenerMethodBinding.java?rev=386886&r1=386885&r2=386886&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/ListenerMethodBinding.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/ListenerMethodBinding.java
Sat Mar 18 13:51:27 2006
@@ -101,4 +101,4 @@
buffer.append(_methodName);
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/LiteralBinding.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/LiteralBinding.java?rev=386886&r1=386885&r2=386886&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/LiteralBinding.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/LiteralBinding.java
Sat Mar 18 13:51:27 2006
@@ -47,4 +47,4 @@
{
return "StaticBinding[" + _value + "]";
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/LiteralBindingFactory.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/LiteralBindingFactory.java?rev=386886&r1=386885&r2=386886&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/LiteralBindingFactory.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/LiteralBindingFactory.java
Sat Mar 18 13:51:27 2006
@@ -34,4 +34,4 @@
return new LiteralBinding(description, getValueConverter(), location,
expression);
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/MessageBinding.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/MessageBinding.java?rev=386886&r1=386885&r2=386886&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/MessageBinding.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/MessageBinding.java
Sat Mar 18 13:51:27 2006
@@ -77,4 +77,4 @@
return buffer.toString();
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/MessageBindingFactory.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/MessageBindingFactory.java?rev=386886&r1=386885&r2=386886&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/MessageBindingFactory.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/MessageBindingFactory.java
Sat Mar 18 13:51:27 2006
@@ -31,4 +31,4 @@
{
return new MessageBinding(description, getValueConverter(), location,
root, expression);
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/OGNLBindingFactory.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/OGNLBindingFactory.java?rev=386886&r1=386885&r2=386886&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/OGNLBindingFactory.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/OGNLBindingFactory.java
Sat Mar 18 13:51:27 2006
@@ -50,4 +50,4 @@
_expressionEvaluator = expressionEvaluator;
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/StateBinding.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/StateBinding.java?rev=386886&r1=386885&r2=386886&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/StateBinding.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/StateBinding.java
Sat Mar 18 13:51:27 2006
@@ -66,4 +66,4 @@
throw new ApplicationRuntimeException(ex.getMessage(),
getLocation(), ex);
}
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/StateBindingFactory.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/StateBindingFactory.java?rev=386886&r1=386885&r2=386886&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/StateBindingFactory.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/StateBindingFactory.java
Sat Mar 18 13:51:27 2006
@@ -39,4 +39,4 @@
_applicationStateManager, expression);
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/callback/DirectCallback.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/callback/DirectCallback.java?rev=386886&r1=386885&r2=386886&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/callback/DirectCallback.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/callback/DirectCallback.java
Sat Mar 18 13:51:27 2006
@@ -42,6 +42,20 @@
private Object[] _parameters;
+ /**
+ * Creates a new DirectCallback for the component. The parameters (which
may be null) is
+ * retained, not copied.
+ */
+
+ public DirectCallback(IDirect component, Object[] parameters)
+ {
+ Defense.notNull(component, "component");
+
+ _pageName = component.getPage().getPageName();
+ _componentIdPath = component.getIdPath();
+ _parameters = parameters;
+ }
+
public String toString()
{
StringBuffer buffer = new StringBuffer("DirectCallback[");
@@ -66,20 +80,6 @@
}
/**
- * Creates a new DirectCallback for the component. The parameters (which
may be null) is
- * retained, not copied.
- */
-
- public DirectCallback(IDirect component, Object[] parameters)
- {
- Defense.notNull(component, "component");
-
- _pageName = component.getPage().getPageName();
- _componentIdPath = component.getIdPath();
- _parameters = parameters;
- }
-
- /**
* Locates the [EMAIL PROTECTED] IDirect}component that was previously
identified (and whose page and id
* path were stored). Invokes [EMAIL PROTECTED]
IRequestCycle#setListenerParameters(Object[])(Object[])}to
* restore the service parameters, then invokes [EMAIL PROTECTED]
IDirect#trigger(IRequestCycle)}on the
@@ -105,4 +105,4 @@
cycle.setListenerParameters(_parameters);
direct.trigger(cycle);
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/callback/ExternalCallback.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/callback/ExternalCallback.java?rev=386886&r1=386885&r2=386886&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/callback/ExternalCallback.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/callback/ExternalCallback.java
Sat Mar 18 13:51:27 2006
@@ -187,4 +187,4 @@
return buffer.toString();
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/callback/ICallback.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/callback/ICallback.java?rev=386886&r1=386885&r2=386886&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/callback/ICallback.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/callback/ICallback.java
Sat Mar 18 13:51:27 2006
@@ -41,5 +41,5 @@
*
**/
- public void performCallback(IRequestCycle cycle);
-}
\ No newline at end of file
+ void performCallback(IRequestCycle cycle);
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/callback/PageCallback.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/callback/PageCallback.java?rev=386886&r1=386885&r2=386886&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/callback/PageCallback.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/callback/PageCallback.java
Sat Mar 18 13:51:27 2006
@@ -116,4 +116,4 @@
cycle.activate(_pageName);
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/IteratorToListConverter.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/IteratorToListConverter.java?rev=386886&r1=386885&r2=386886&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/IteratorToListConverter.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/IteratorToListConverter.java
Sat Mar 18 13:51:27 2006
@@ -30,8 +30,8 @@
Iterator it = (Iterator) value;
List list = new ArrayList();
while (it.hasNext())
- list.add(it.next());
+ list.add(it.next());
return list;
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/MapToBooleanConverter.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/MapToBooleanConverter.java?rev=386886&r1=386885&r2=386886&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/MapToBooleanConverter.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/MapToBooleanConverter.java
Sat Mar 18 13:51:27 2006
@@ -31,4 +31,4 @@
return map.isEmpty() ? Boolean.FALSE : Boolean.TRUE;
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/NullToBooleanConverter.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/NullToBooleanConverter.java?rev=386886&r1=386885&r2=386886&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/NullToBooleanConverter.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/NullToBooleanConverter.java
Sat Mar 18 13:51:27 2006
@@ -28,4 +28,4 @@
return Boolean.FALSE;
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/NullToIteratorConverter.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/NullToIteratorConverter.java?rev=386886&r1=386885&r2=386886&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/NullToIteratorConverter.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/NullToIteratorConverter.java
Sat Mar 18 13:51:27 2006
@@ -28,4 +28,4 @@
return Collections.EMPTY_LIST.iterator();
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/NullToListConverter.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/NullToListConverter.java?rev=386886&r1=386885&r2=386886&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/NullToListConverter.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/NullToListConverter.java
Sat Mar 18 13:51:27 2006
@@ -28,4 +28,4 @@
return Collections.EMPTY_LIST;
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/NumberToBooleanConverter.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/NumberToBooleanConverter.java?rev=386886&r1=386885&r2=386886&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/NumberToBooleanConverter.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/NumberToBooleanConverter.java
Sat Mar 18 13:51:27 2006
@@ -29,4 +29,4 @@
return n.longValue() == 0 ? Boolean.FALSE : Boolean.TRUE;
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/ObjectArrayToIteratorConverter.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/ObjectArrayToIteratorConverter.java?rev=386886&r1=386885&r2=386886&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/ObjectArrayToIteratorConverter.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/ObjectArrayToIteratorConverter.java
Sat Mar 18 13:51:27 2006
@@ -33,4 +33,4 @@
return l.iterator();
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/ObjectArrayToListConverter.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/ObjectArrayToListConverter.java?rev=386886&r1=386885&r2=386886&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/ObjectArrayToListConverter.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/ObjectArrayToListConverter.java
Sat Mar 18 13:51:27 2006
@@ -33,4 +33,4 @@
return l;
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/ObjectToStringConverter.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/ObjectToStringConverter.java?rev=386886&r1=386885&r2=386886&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/ObjectToStringConverter.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/ObjectToStringConverter.java
Sat Mar 18 13:51:27 2006
@@ -26,4 +26,4 @@
return value == null ? null : value.toString();
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/StringConvertedPropertySelectionModel.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/StringConvertedPropertySelectionModel.java?rev=386886&r1=386885&r2=386886&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/StringConvertedPropertySelectionModel.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/StringConvertedPropertySelectionModel.java
Sat Mar 18 13:51:27 2006
@@ -29,6 +29,10 @@
*/
public final class StringConvertedPropertySelectionModel implements
IPropertySelectionModel
{
+ /**
+ * Entry.
+ * @author Howard Lewis Ship
+ */
private static class Entry
{
String _label;
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/StringToBooleanConverter.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/StringToBooleanConverter.java?rev=386886&r1=386885&r2=386886&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/StringToBooleanConverter.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/StringToBooleanConverter.java
Sat Mar 18 13:51:27 2006
@@ -38,4 +38,4 @@
return b ? Boolean.TRUE : Boolean.FALSE;
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/TypeConverter.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/TypeConverter.java?rev=386886&r1=386885&r2=386886&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/TypeConverter.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/TypeConverter.java
Sat Mar 18 13:51:27 2006
@@ -30,5 +30,5 @@
* will return different types.
* @throws org.apache.hivemind.ApplicationRuntimeException if the value
can not be converted
*/
- public Object convertValue(Object value);
+ Object convertValue(Object value);
}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/TypeConverterContribution.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/TypeConverterContribution.java?rev=386886&r1=386885&r2=386886&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/TypeConverterContribution.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/TypeConverterContribution.java
Sat Mar 18 13:51:27 2006
@@ -47,4 +47,4 @@
_subjectClass = subjectClass;
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/TypeConverterWrapper.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/TypeConverterWrapper.java?rev=386886&r1=386885&r2=386886&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/TypeConverterWrapper.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/TypeConverterWrapper.java
Sat Mar 18 13:51:27 2006
@@ -82,4 +82,4 @@
{
_nullConverter = nullConverter;
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/ValueConverter.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/ValueConverter.java?rev=386886&r1=386885&r2=386886&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/ValueConverter.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/ValueConverter.java
Sat Mar 18 13:51:27 2006
@@ -40,5 +40,5 @@
* @throws org.apache.hivemind.ApplicationRuntimeException
* if the value can not be converted
*/
- public Object coerceValue(Object value, Class desiredType);
-}
\ No newline at end of file
+ Object coerceValue(Object value, Class desiredType);
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/ValueConverterImpl.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/ValueConverterImpl.java?rev=386886&r1=386885&r2=386886&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/ValueConverterImpl.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/ValueConverterImpl.java
Sat Mar 18 13:51:27 2006
@@ -34,11 +34,11 @@
*/
public class ValueConverterImpl implements ValueConverter
{
- private Map _converterMap = new HashMap();
-
/** List of [EMAIL PROTECTED]
org.apache.tapestry.coerce.TypeConverterContribution}. */
public List _contributions;
+
+ private Map _converterMap = new HashMap();
private Map _primitiveToWrapper = new HashMap();
@@ -185,4 +185,4 @@
{
_contributions = contributions;
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/components/Delegator.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/components/Delegator.java?rev=386886&r1=386885&r2=386886&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/components/Delegator.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/components/Delegator.java
Sat Mar 18 13:51:27 2006
@@ -20,29 +20,26 @@
import org.apache.tapestry.IRequestCycle;
/**
- * A component which delegates it's behavior to another object.
- *
- * [<a href="../../../../../ComponentReference/Delegator.html">Component
Reference</a>]
- *
- * @author Howard Lewis Ship
+ * A component which delegates it's behavior to another object. [<a
+ * href="../../../../../ComponentReference/Delegator.html">Component
Reference</a>]
*
- **/
+ * @author Howard Lewis Ship
+ */
public abstract class Delegator extends AbstractComponent
{
+
/**
- * Gets its delegate and invokes [EMAIL PROTECTED]
IRender#render(IMarkupWriter, IRequestCycle)}
- * on it.
- *
- **/
+ * Gets its delegate and invokes
+ * [EMAIL PROTECTED] IRender#render(IMarkupWriter, IRequestCycle)} on it.
+ */
protected void renderComponent(IMarkupWriter writer, IRequestCycle cycle)
{
- IRender delegate = getDelegate();
-
- if (delegate != null)
- delegate.render(writer, cycle);
+ IRender delegate = getDelegate();
+
+ if (delegate != null) delegate.render(writer, cycle);
}
-
+
public abstract IRender getDelegate();
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/parse/TemplateParser.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/parse/TemplateParser.java?rev=386886&r1=386885&r2=386886&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/parse/TemplateParser.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/parse/TemplateParser.java
Sat Mar 18 13:51:27 2006
@@ -322,7 +322,7 @@
try
{
beforeParse(templateData, delegate, resourceLocation);
-
+
parse();
return (TemplateToken[]) _tokens.toArray(new
TemplateToken[_tokens.size()]);
@@ -463,20 +463,20 @@
_cursor = 0;
_blockStart = -1;
int length = _templateData.length;
-
+
while (_cursor < length)
{
if (_templateData[_cursor] != '<')
{
if (_blockStart < 0 && !_ignoring)
_blockStart = _cursor;
-
+
advance();
continue;
}
-
+
// OK, start of something.
-
+
if (lookahead(CLOSE_TAG))
{
closeTag();
@@ -488,17 +488,17 @@
skipComment();
continue;
}
-
+
// The start of some tag.
-
+
startTag();
}
-
+
// Usually there's some text at the end of the template (after the
last closing tag) that
// should
// be added. Often the last few tags are static tags so we definately
// need to end the text block.
-
+
addTextToken(_templateData.length - 1);
}
@@ -1267,33 +1267,32 @@
if (_cursor >= length)
return;
-
+
char ch = _templateData[_cursor];
-
+
_cursor++;
-
+
if (ch == '\n')
{
_line++;
_currentLocation = null;
return;
}
-
+
// A \r, or a \r\n also counts as a new line.
-
+
if (ch == '\r')
{
_line++;
_currentLocation = null;
-
+
if (_cursor < length && _templateData[_cursor] == '\n')
_cursor++;
-
+
return;
}
-
+
// Not an end-of-line character.
-
}
private void advanceOverWhitespace()
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/parse/TemplateToken.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/parse/TemplateToken.java?rev=386886&r1=386885&r2=386886&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/parse/TemplateToken.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/parse/TemplateToken.java
Sat Mar 18 13:51:27 2006
@@ -71,4 +71,4 @@
protected void extendDescription(ToStringBuilder builder)
{
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/junit/parse/NamespaceAttributeName.html
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/junit/parse/NamespaceAttributeName.html?rev=386886&r1=386885&r2=386886&view=diff
==============================================================================
Binary files - no diff available.
Modified:
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/junit/parse/TestTemplateParser.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/junit/parse/TestTemplateParser.java?rev=386886&r1=386885&r2=386886&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/junit/parse/TestTemplateParser.java
(original)
+++
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/junit/parse/TestTemplateParser.java
Sat Mar 18 13:51:27 2006
@@ -83,7 +83,7 @@
Resource location) throws TemplateParseException
{
TemplateParser parser = new TemplateParser();
-
+
parser.setFactory(new TemplateTokenFactory());
return parser.parse(templateData, delegate, location);
@@ -118,14 +118,14 @@
{
String thisClassName = getClass().getName();
String thisPath = "/" + thisClassName.replace('.', '/') + "/" + file;
-
+
Resource location = new ClasspathResource(new DefaultClassResolver(),
thisPath);
-
+
InputStream stream = getClass().getResourceAsStream(file);
-
+
if (stream == null)
throw new TemplateParseException("File " + file + " not found.");
-
+
return run(stream, delegate, location);
}
@@ -641,7 +641,7 @@
assertCloseToken(tokens[4], 4);
assertCloseToken(tokens[6], 5);
}
-
+
/** @since 4.0 */
public void testDuplicateTagAttributeFailure()
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
