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/03/15 05:17:26 UTC
svn commit: r385968 [1/3] - in /jakarta/tapestry/trunk: .settings/
contrib/src/java/org/apache/tapestry/contrib/components/
contrib/src/java/org/apache/tapestry/contrib/form/
contrib/src/java/org/apache/tapestry/contrib/form/checkboxes/
contrib/src/jav...
Author: jkuhnert
Date: Tue Mar 14 20:17:15 2006
New Revision: 385968
URL: http://svn.apache.org/viewcvs?rev=385968&view=rev
Log:
Fixed more unit tests, allowed myself to be consumed by checkstyle for way too long
Removed:
jakarta/tapestry/trunk/framework/src/scripts/TestGlobal.xml
jakarta/tapestry/trunk/framework/src/test-data/context26/
Modified:
jakarta/tapestry/trunk/.settings/org.eclipse.jdt.core.prefs
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/components/Choose.java
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/form/CheckBoxMultiplePropertySelectionRenderer.java
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/form/checkboxes/CheckboxGroup.java
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/form/checkboxes/ControlledCheckbox.java
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/jdbc/BooleanParameter.java
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/link/AreaLinkRenderer.java
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/link/ButtonLinkRenderer.java
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/common/AbstractTableColumn.java
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/common/AbstractTableDataModel.java
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/common/ArrayIterator.java
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/common/BasicTableModelWrap.java
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/common/BlockTableRendererSource.java
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/common/ComponentTableRendererSource.java
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/ColumnComparator.java
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/valid/DateField.java
jakarta/tapestry/trunk/examples/TimeTracker/ (props changed)
jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/ActivateCallback.java
jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/components/BookLink.java
jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/components/Border.java
jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/components/Borrow.java
jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/components/Browser.java
jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/BookMatches.java
jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/BorrowedBooks.java
jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/services/BookQuerySourceImpl.java
jakarta/tapestry/trunk/examples/Vlib/src/test/org/apache/tapestry/vlib/services/RemoteTemplateTest.java
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/BorrowException.java
jakarta/tapestry/trunk/examples/VlibBeans/src/java/org/apache/tapestry/vlib/ejb/impl/AbstractEntityBean.java
jakarta/tapestry/trunk/examples/VlibBeans/src/java/org/apache/tapestry/vlib/ejb/impl/BookBean.java
jakarta/tapestry/trunk/examples/VlibBeans/src/java/org/apache/tapestry/vlib/ejb/impl/BookQueryBean.java
jakarta/tapestry/trunk/examples/VlibBeans/src/java/org/apache/tapestry/vlib/ejb/impl/OperationsBean.java
jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/chart/ChartService.java
jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/components/Border.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/ApplicationServlet.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/BaseComponent.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/BindingException.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/ConfigurationDefaults.properties
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/Constants.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/bean/AbstractBeanInitializer.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/bean/BeanMessages.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/bean/BeanProvider.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/bean/BeanStrings.properties
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/bean/Default.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/AbstractBinding.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/AbstractBindingFactory.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/AssetBinding.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/AssetBindingFactory.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/BeanBinding.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/BeanBindingFactory.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/BindingConstants.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/BindingFactory.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/BindingMessages.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/BindingSource.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/BindingStrings.properties
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/ComponentBinding.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/binding/ComponentBindingFactory.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/callback/CallbackMessages.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/CoerceMessages.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/CollectionToBooleanConverter.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/CollectionToIteratorConverter.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/coerce/CollectionToListConverter.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/components/Any.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/components/Block.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/components/BlockRenderer.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/components/ComponentMessages.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/components/Conditional.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/describe/CookieStrategy.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/engine/ActionService.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/engine/ActionServiceParameter.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/engine/BaseEngine.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/engine/encoders/AssetEncoder.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/engine/state/ApplicationScopeManager.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/engine/state/ApplicationStateManager.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/engine/state/ApplicationStateManagerImpl.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/engine/state/DefaultGlobalStateObjectFactory.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/enhance/AbstractPropertyWorker.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/enhance/ComponentConstructorImpl.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/event/ChangeObserver.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/AbstractFormComponent.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/AbstractSubmit.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/Checkbox.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/DatePicker.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/DatePicker.properties
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/validator/BaseValidator.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Body.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/multipart/AbstractMultipartDecoder.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/pageload/ComponentClassProvider.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/pageload/ComponentClassProviderContext.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/parse/BeanSetPropertySetter.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/parse/BindingSetter.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/parse/ComponentTemplate.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/record/ChangeKey.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/record/ClientPropertyPersistenceScope.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/record/ClientPropertyPersistenceStrategy.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/request/DecodedRequest.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/request/DecodedRequestInjector.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/request/DecodedRequestWrapper.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/resolver/AbstractSpecificationResolver.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/resolver/ComponentSpecificationResolver.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/resolver/ComponentSpecificationResolverImpl.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/script/AbstractToken.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/script/AbstractTokenRule.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/script/BodyToken.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/AbsoluteURLBuilder.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ApplicationGlobals.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ClassFinder.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ComponentConstructor.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ComponentConstructorFactory.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ComponentMessagesSource.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ComponentPropertySource.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ComponentTemplateLoader.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/CookieSource.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/DataSqueezer.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/AbsoluteURLBuilderImpl.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/AbstractSetupApplicationGlobals.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ApplicationGlobalsImpl.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ApplicationSpecificationInitializer.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/BaseTagWriter.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/BindingPrefixContribution.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/BindingSourceImpl.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ComponentConstructorFactoryImpl.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ComponentMessages.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/ComponentPropertySourceImpl.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ComponentTemplateLoaderImpl.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ComponentTemplateLoaderLogic.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/CookieSourceImpl.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/ApplicationSpecification.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/AssetSpecification.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/BeanLifecycle.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/BeanSpecification.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/BindingSpecification.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/BindingType.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/test/CreatePropertyWorker.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/test/Creator.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/BasePropertyHolder.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/ComponentAddress.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/ContentType.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/exception/ExceptionAnalyzer.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/io/BinaryDumpOutputStream.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/io/BooleanAdaptor.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/io/ByteAdaptor.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/io/ComponentAddressAdaptor.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/io/DataSqueezerImpl.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/io/DataSqueezerUtil.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/text/AsciiCharacterMatcher.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/text/AsciiCharacterTranslator.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/text/CompoundMatcher.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/text/DefaultCharacterTranslatorSource.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/xml/BaseRule.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/AbstractNumericValidator.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/DateValidator.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/NumberValidator.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/web/AttributeHolder.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/wml/AbstractPostfield.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/wml/Card.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/wml/Deck.java
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/ActionServiceTest.java
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/junit/parse/TestTemplateParser.java
jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/ActionRequestServicer.java
jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/ActionRequestServicerFilter.java
jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/ActionRequestServicerToWebRequestServicerBridge.java
jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/ApplicationPortlet.java
jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/bindings/BindingsMessages.java
jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/bindings/BindingsStrings.properties
jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/multipart/ActionRequestWrapper.java
Modified: jakarta/tapestry/trunk/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/.settings/org.eclipse.jdt.core.prefs?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/.settings/org.eclipse.jdt.core.prefs (original)
+++ jakarta/tapestry/trunk/.settings/org.eclipse.jdt.core.prefs Tue Mar 14 20:17:15 2006
@@ -1,4 +1,4 @@
-#Sun Mar 12 18:21:48 EST 2006
+#Tue Mar 14 22:37:08 EST 2006
=\=\=\=\=\=\=
<<<<<<<=.working
>>>>>>>=.merge-right.r368223
@@ -21,7 +21,7 @@
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=ignore
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=error
Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/components/Choose.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/components/Choose.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/components/Choose.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/components/Choose.java Tue Mar 14 20:17:15 2006
@@ -19,43 +19,42 @@
import org.apache.tapestry.components.Conditional;
/**
- * This component is a container for {@link When} or Otherwise components;
- * it provides the context for mutually exclusive conditional evaluation.
- *
- * [<a href="../../../../../../ComponentReference/contrib.Choose.html">Component Reference</a>]
- *
- * @author David Solis
+ * This component is a container for {@link When} or Otherwise components; it
+ * provides the context for mutually exclusive conditional evaluation. [<a
+ * href="../../../../../../ComponentReference/contrib.Choose.html">Component
+ * Reference</a>]
*
+ * @author David Solis
*/
-public abstract class Choose extends Conditional {
+public abstract class Choose extends Conditional
+{
+ public void addBody(IRender element)
+ {
+ super.addBody(element);
+ if (element instanceof When) ((When) element).setChoose(this);
+ }
- public void addBody(IRender element)
- {
- super.addBody(element);
- if (element instanceof When)
- ((When) element).setChoose(this);
- }
-
- protected void cleanupAfterRender(IRequestCycle cycle)
- {
- setConditionMet(false);
- super.cleanupAfterRender(cycle);
- }
-
- protected boolean evaluateCondition()
- {
- return getCondition();
- }
-
- public boolean getInvert()
- {
- // This component doesn't require invert parameter.
- return false;
- }
-
- public abstract boolean getCondition();
-
- public abstract boolean isConditionMet();
- public abstract void setConditionMet(boolean value);
+ protected void cleanupAfterRender(IRequestCycle cycle)
+ {
+ setConditionMet(false);
+ super.cleanupAfterRender(cycle);
+ }
+
+ protected boolean evaluateCondition()
+ {
+ return getCondition();
+ }
+
+ public boolean getInvert()
+ {
+ // This component doesn't require invert parameter.
+ return false;
+ }
+
+ public abstract boolean getCondition();
+
+ public abstract boolean isConditionMet();
+
+ public abstract void setConditionMet(boolean value);
}
Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/form/CheckBoxMultiplePropertySelectionRenderer.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/form/CheckBoxMultiplePropertySelectionRenderer.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/form/CheckBoxMultiplePropertySelectionRenderer.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/form/CheckBoxMultiplePropertySelectionRenderer.java Tue Mar 14 20:17:15 2006
@@ -99,4 +99,4 @@
writer.println();
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/form/checkboxes/CheckboxGroup.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/form/checkboxes/CheckboxGroup.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/form/checkboxes/CheckboxGroup.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/form/checkboxes/CheckboxGroup.java Tue Mar 14 20:17:15 2006
@@ -28,16 +28,16 @@
*/
public abstract class CheckboxGroup extends BaseComponent
{
- public final static String CHECKBOX_GROUP_ATTRIBUTE = "org.apache.tapestry.contrib.form.CheckboxGroup";
-
+ public static final String CHECKBOX_GROUP_ATTRIBUTE = "org.apache.tapestry.contrib.form.CheckboxGroup";
+
public abstract Collection getCheckboxNames();
public abstract String getFunctionName();
public abstract void setFunctionName(String functionName);
public void registerControlledCheckbox(ControlledCheckbox checkbox)
{
- String name = checkbox.getCheckboxName();
- String form = checkbox.getForm().getName();
+ String name = checkbox.getCheckboxName();
+ String form = checkbox.getForm().getName();
getCheckboxNames().add(form + "." + name);
}
@@ -65,9 +65,9 @@
String functionName = "setCheckboxGroup";
if (!cycle.isRewinding()) {
- PageRenderSupport body = TapestryUtils.getPageRenderSupport(cycle, this);
- if (body != null)
- functionName = body.getUniqueString("setCheckboxGroup");
+ PageRenderSupport body = TapestryUtils.getPageRenderSupport(cycle, this);
+ if (body != null)
+ functionName = body.getUniqueString("setCheckboxGroup");
}
setFunctionName(functionName);
Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/form/checkboxes/ControlledCheckbox.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/form/checkboxes/ControlledCheckbox.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/form/checkboxes/ControlledCheckbox.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/form/checkboxes/ControlledCheckbox.java Tue Mar 14 20:17:15 2006
@@ -27,29 +27,31 @@
*/
public abstract class ControlledCheckbox extends BaseComponent
{
+
public abstract CheckboxGroup getGroup();
-
+
public String getCheckboxName()
{
Checkbox checkbox = (Checkbox) getComponent("checkbox");
String name = checkbox.getName();
return name;
}
-
+
public IForm getForm()
{
- Checkbox checkbox = (Checkbox) getComponent("checkbox");
- IForm form = checkbox.getForm();
- return form;
+ Checkbox checkbox = (Checkbox) getComponent("checkbox");
+ IForm form = checkbox.getForm();
+ return form;
}
-
+
/**
- * @see org.apache.tapestry.BaseComponent#renderComponent(org.apache.tapestry.IMarkupWriter, org.apache.tapestry.IRequestCycle)
+ * @see org.apache.tapestry.BaseComponent#renderComponent(org.apache.tapestry.IMarkupWriter,
+ * org.apache.tapestry.IRequestCycle)
*/
protected void renderComponent(IMarkupWriter writer, IRequestCycle cycle)
{
super.renderComponent(writer, cycle);
-
+
registerCheckbox();
}
@@ -57,16 +59,21 @@
{
getCheckboxGroup().registerControlledCheckbox(this);
}
-
+
public CheckboxGroup getCheckboxGroup()
{
CheckboxGroup group = getGroup();
- if (group == null) {
+ if (group == null)
+ {
IRequestCycle cycle = getPage().getRequestCycle();
- group = (CheckboxGroup) cycle.getAttribute(CheckboxGroup.CHECKBOX_GROUP_ATTRIBUTE);
+ group = (CheckboxGroup) cycle
+ .getAttribute(CheckboxGroup.CHECKBOX_GROUP_ATTRIBUTE);
}
if (group == null)
- throw new ApplicationRuntimeException("The component " + getExtendedId() + " must be wrapped by a CheckboxGroup or the 'group' parameter must be set.");
+ throw new ApplicationRuntimeException(
+ "The component "
+ + getExtendedId()
+ + " must be wrapped by a CheckboxGroup or the 'group' parameter must be set.");
return group;
}
Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/jdbc/BooleanParameter.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/jdbc/BooleanParameter.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/jdbc/BooleanParameter.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/jdbc/BooleanParameter.java Tue Mar 14 20:17:15 2006
@@ -26,13 +26,13 @@
*
*/
-public class BooleanParameter implements IParameter
+public final class BooleanParameter implements IParameter
{
- private boolean _value;
-
public static final BooleanParameter TRUE = new BooleanParameter(true);
public static final BooleanParameter FALSE = new BooleanParameter(false);
+
+ private boolean _value;
private BooleanParameter(boolean value)
{
Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/link/AreaLinkRenderer.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/link/AreaLinkRenderer.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/link/AreaLinkRenderer.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/link/AreaLinkRenderer.java Tue Mar 14 20:17:15 2006
@@ -18,28 +18,28 @@
import org.apache.tapestry.link.ILinkRenderer;
/**
- * A subclass of {@link org.apache.tapestry.link.DefaultLinkRenderer} for
- * the HTML area element.
- *
- * @author David Solis
- * @since 3.0
+ * A subclass of {@link org.apache.tapestry.link.DefaultLinkRenderer} for the
+ * HTML area element.
+ *
+ * @author David Solis
+ * @since 3.0
*/
-public class AreaLinkRenderer extends DefaultLinkRenderer
+public class AreaLinkRenderer extends DefaultLinkRenderer
{
- /**
- * A singleton for the area link.
- **/
+ /**
+ * A singleton for the area link.
+ */
- public static final ILinkRenderer SHARED_INSTANCE = new AreaLinkRenderer();
+ public static final ILinkRenderer SHARED_INSTANCE = new AreaLinkRenderer();
- public String getElement()
- {
- return "area";
- }
+ public String getElement()
+ {
+ return "area";
+ }
- public boolean getHasBody()
- {
- return false;
- }
+ public boolean getHasBody()
+ {
+ return false;
+ }
}
Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/link/ButtonLinkRenderer.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/link/ButtonLinkRenderer.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/link/ButtonLinkRenderer.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/link/ButtonLinkRenderer.java Tue Mar 14 20:17:15 2006
@@ -58,11 +58,11 @@
}
if (!cycle.isRewinding()) {
- String url = link.getURL(component.getAnchor(), true);
- String target = component.getTarget();
- String onclick = (target == null) ? getScript(url) : getScript(url, target);
-
- writer.attribute("onclick", onclick);
+ String url = link.getURL(component.getAnchor(), true);
+ String target = component.getTarget();
+ String onclick = (target == null) ? getScript(url) : getScript(url, target);
+
+ writer.attribute("onclick", onclick);
}
component.renderAdditionalAttributes(writer, cycle);
@@ -98,4 +98,4 @@
{
return "window.open('" + url + "','" + target + "')";
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/common/AbstractTableColumn.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/common/AbstractTableColumn.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/common/AbstractTableColumn.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/common/AbstractTableColumn.java Tue Mar 14 20:17:15 2006
@@ -27,8 +27,9 @@
import org.apache.tapestry.valid.RenderString;
/**
- * A base implementation of {@link org.apache.tapestry.contrib.table.model.ITableColumn}
- * that allows renderers to be set via aggregation.
+ * A base implementation of
+ * {@link org.apache.tapestry.contrib.table.model.ITableColumn} that allows
+ * renderers to be set via aggregation.
*
* @see org.apache.tapestry.contrib.table.model.ITableRendererSource
* @author mindbridge
@@ -36,203 +37,216 @@
*/
public class AbstractTableColumn implements IAdvancedTableColumn, Serializable
{
- private static final long serialVersionUID = 1L;
- /**
- * The suffix of the name of the Block that will be used as the column renderer
- * for this column
+ /**
+ * The suffix of the name of the Block that will be used as the column
+ * renderer for this column.
*/
public static final String COLUMN_RENDERER_BLOCK_SUFFIX = "ColumnHeader";
/**
- * The suffix of the name of the Block that will be used as the value renderer
- * for this column
+ * The suffix of the name of the Block that will be used as the value
+ * renderer for this column.
*/
public static final String VALUE_RENDERER_BLOCK_SUFFIX = "ColumnValue";
-
- private String m_strColumnName;
- private boolean m_bSortable;
- private Comparator m_objComparator;
-
- private ITableRendererSource m_objColumnRendererSource;
- private ITableRendererSource m_objValueRendererSource;
-
- public AbstractTableColumn()
- {
- this("", false, null);
- }
-
- public AbstractTableColumn(
- String strColumnName,
- boolean bSortable,
- Comparator objComparator)
- {
- this(strColumnName, bSortable, objComparator, null, null);
- }
-
- public AbstractTableColumn(
- String strColumnName,
- boolean bSortable,
- Comparator objComparator,
- ITableRendererSource objColumnRendererSource,
- ITableRendererSource objValueRendererSource)
- {
- setColumnName(strColumnName);
- setSortable(bSortable);
- setComparator(objComparator);
- setColumnRendererSource(objColumnRendererSource);
- setValueRendererSource(objValueRendererSource);
- }
-
- /**
- * @see org.apache.tapestry.contrib.table.model.ITableColumn#getColumnName()
- */
- public String getColumnName()
- {
- return m_strColumnName;
- }
-
- /**
- * Sets the columnName.
- * @param columnName The columnName to set
- */
- public void setColumnName(String columnName)
- {
- m_strColumnName = columnName;
- }
-
- /**
- * @see org.apache.tapestry.contrib.table.model.ITableColumn#getSortable()
- */
- public boolean getSortable()
- {
- return m_bSortable;
- }
-
- /**
- * Sets whether the column is sortable.
- * @param sortable The sortable flag to set
- */
- public void setSortable(boolean sortable)
- {
- m_bSortable = sortable;
- }
-
- /**
- * @see org.apache.tapestry.contrib.table.model.ITableColumn#getComparator()
- */
- public Comparator getComparator()
- {
- return m_objComparator;
- }
-
- /**
- * Sets the comparator.
- * @param comparator The comparator to set
- */
- public void setComparator(Comparator comparator)
- {
- m_objComparator = comparator;
- }
-
- /**
- * @see org.apache.tapestry.contrib.table.model.ITableColumn#getColumnRenderer(IRequestCycle, ITableModelSource)
- */
- public IRender getColumnRenderer(
- IRequestCycle objCycle,
- ITableModelSource objSource)
- {
- ITableRendererSource objRendererSource =
- getColumnRendererSource();
- if (objRendererSource == null)
- {
- // log error
- return new RenderString("");
- }
-
- return objRendererSource.getRenderer(objCycle, objSource, this, null);
- }
-
- /**
- * @see org.apache.tapestry.contrib.table.model.ITableColumn#getValueRenderer(IRequestCycle, ITableModelSource, Object)
- */
- public IRender getValueRenderer(
- IRequestCycle objCycle,
- ITableModelSource objSource,
- Object objRow)
- {
- ITableRendererSource objRendererSource = getValueRendererSource();
- if (objRendererSource == null)
- {
- // log error
- return new RenderString("");
- }
-
- return objRendererSource.getRenderer(
- objCycle,
- objSource,
- this,
- objRow);
- }
-
- /**
- * Returns the columnRendererSource.
- * @return ITableColumnRendererSource
- */
- public ITableRendererSource getColumnRendererSource()
- {
- return m_objColumnRendererSource;
- }
-
- /**
- * Sets the columnRendererSource.
- * @param columnRendererSource The columnRendererSource to set
- */
- public void setColumnRendererSource(ITableRendererSource columnRendererSource)
- {
- m_objColumnRendererSource = columnRendererSource;
- }
-
- /**
- * Returns the valueRendererSource.
- *
- * @return the valueRendererSource of this column
- */
- public ITableRendererSource getValueRendererSource()
- {
- return m_objValueRendererSource;
- }
-
- /**
- * Sets the valueRendererSource.
- *
- * @param valueRendererSource The valueRendererSource to set
- */
- public void setValueRendererSource(ITableRendererSource valueRendererSource)
- {
- m_objValueRendererSource = valueRendererSource;
- }
-
- /**
- * Use the column name to get the column and value renderer sources
- * from the provided component.
- * Use the column and value renderer sources for all columns if necessary.
- *
- * @param objSettingsContainer the component from which to get the settings
+
+ private static final long serialVersionUID = 1L;
+
+ private String m_strColumnName;
+ private boolean m_bSortable;
+ private Comparator m_objComparator;
+
+ private ITableRendererSource m_objColumnRendererSource;
+ private ITableRendererSource m_objValueRendererSource;
+
+ public AbstractTableColumn()
+ {
+ this("", false, null);
+ }
+
+ public AbstractTableColumn(String strColumnName, boolean bSortable,
+ Comparator objComparator)
+ {
+ this(strColumnName, bSortable, objComparator, null, null);
+ }
+
+ public AbstractTableColumn(String strColumnName, boolean bSortable,
+ Comparator objComparator,
+ ITableRendererSource objColumnRendererSource,
+ ITableRendererSource objValueRendererSource)
+ {
+ setColumnName(strColumnName);
+ setSortable(bSortable);
+ setComparator(objComparator);
+ setColumnRendererSource(objColumnRendererSource);
+ setValueRendererSource(objValueRendererSource);
+ }
+
+ /**
+ * @see org.apache.tapestry.contrib.table.model.ITableColumn#getColumnName()
*/
- public void loadSettings(IComponent objSettingsContainer)
+ public String getColumnName()
+ {
+ return m_strColumnName;
+ }
+
+ /**
+ * Sets the columnName.
+ *
+ * @param columnName
+ * The columnName to set
+ */
+ public void setColumnName(String columnName)
+ {
+ m_strColumnName = columnName;
+ }
+
+ /**
+ * @see org.apache.tapestry.contrib.table.model.ITableColumn#getSortable()
+ */
+ public boolean getSortable()
+ {
+ return m_bSortable;
+ }
+
+ /**
+ * Sets whether the column is sortable.
+ *
+ * @param sortable
+ * The sortable flag to set
+ */
+ public void setSortable(boolean sortable)
+ {
+ m_bSortable = sortable;
+ }
+
+ /**
+ * @see org.apache.tapestry.contrib.table.model.ITableColumn#getComparator()
+ */
+ public Comparator getComparator()
+ {
+ return m_objComparator;
+ }
+
+ /**
+ * Sets the comparator.
+ *
+ * @param comparator
+ * The comparator to set
+ */
+ public void setComparator(Comparator comparator)
{
- IComponent objColumnRendererSource = (IComponent) objSettingsContainer.getComponents().get(getColumnName() + COLUMN_RENDERER_BLOCK_SUFFIX);
- if (objColumnRendererSource == null)
- objColumnRendererSource = (IComponent) objSettingsContainer.getComponents().get(COLUMN_RENDERER_BLOCK_SUFFIX);
- if (objColumnRendererSource != null && objColumnRendererSource instanceof Block)
- setColumnRendererSource(new BlockTableRendererSource((Block) objColumnRendererSource));
+ m_objComparator = comparator;
+ }
- IComponent objValueRendererSource = (IComponent) objSettingsContainer.getComponents().get(getColumnName() + VALUE_RENDERER_BLOCK_SUFFIX);
+ /**
+ * @see org.apache.tapestry.contrib.table.model.ITableColumn#getColumnRenderer(IRequestCycle,
+ * ITableModelSource)
+ */
+ public IRender getColumnRenderer(IRequestCycle objCycle,
+ ITableModelSource objSource)
+ {
+ ITableRendererSource objRendererSource = getColumnRendererSource();
+ if (objRendererSource == null)
+ {
+ // log error
+ return new RenderString("");
+ }
+
+ return objRendererSource.getRenderer(objCycle, objSource, this, null);
+ }
+
+ /**
+ * @see org.apache.tapestry.contrib.table.model.ITableColumn#getValueRenderer(IRequestCycle,
+ * ITableModelSource, Object)
+ */
+ public IRender getValueRenderer(IRequestCycle objCycle,
+ ITableModelSource objSource, Object objRow)
+ {
+ ITableRendererSource objRendererSource = getValueRendererSource();
+ if (objRendererSource == null)
+ {
+ // log error
+ return new RenderString("");
+ }
+
+ return objRendererSource.getRenderer(objCycle, objSource, this, objRow);
+ }
+
+ /**
+ * Returns the columnRendererSource.
+ *
+ * @return ITableColumnRendererSource
+ */
+ public ITableRendererSource getColumnRendererSource()
+ {
+ return m_objColumnRendererSource;
+ }
+
+ /**
+ * Sets the columnRendererSource.
+ *
+ * @param columnRendererSource
+ * The columnRendererSource to set
+ */
+ public void setColumnRendererSource(
+ ITableRendererSource columnRendererSource)
+ {
+ m_objColumnRendererSource = columnRendererSource;
+ }
+
+ /**
+ * Returns the valueRendererSource.
+ *
+ * @return the valueRendererSource of this column
+ */
+ public ITableRendererSource getValueRendererSource()
+ {
+ return m_objValueRendererSource;
+ }
+
+ /**
+ * Sets the valueRendererSource.
+ *
+ * @param valueRendererSource
+ * The valueRendererSource to set
+ */
+ public void setValueRendererSource(ITableRendererSource valueRendererSource)
+ {
+ m_objValueRendererSource = valueRendererSource;
+ }
+
+ /**
+ * Use the column name to get the column and value renderer sources from the
+ * provided component. Use the column and value renderer sources for all
+ * columns if necessary.
+ *
+ * @param objSettingsContainer
+ * the component from which to get the settings
+ */
+ public void loadSettings(IComponent objSettingsContainer)
+ {
+ IComponent objColumnRendererSource = (IComponent) objSettingsContainer
+ .getComponents().get(
+ getColumnName() + COLUMN_RENDERER_BLOCK_SUFFIX);
+ if (objColumnRendererSource == null)
+ objColumnRendererSource = (IComponent) objSettingsContainer
+ .getComponents().get(COLUMN_RENDERER_BLOCK_SUFFIX);
+ if (objColumnRendererSource != null
+ && objColumnRendererSource instanceof Block)
+ setColumnRendererSource(new BlockTableRendererSource(
+ (Block) objColumnRendererSource));
+
+ IComponent objValueRendererSource = (IComponent) objSettingsContainer
+ .getComponents().get(
+ getColumnName() + VALUE_RENDERER_BLOCK_SUFFIX);
if (objValueRendererSource == null)
- objValueRendererSource = (IComponent) objSettingsContainer.getComponents().get(VALUE_RENDERER_BLOCK_SUFFIX);
- if (objValueRendererSource != null && objValueRendererSource instanceof Block)
- setValueRendererSource(new BlockTableRendererSource((Block) objValueRendererSource));
+ objValueRendererSource = (IComponent) objSettingsContainer
+ .getComponents().get(VALUE_RENDERER_BLOCK_SUFFIX);
+ if (objValueRendererSource != null
+ && objValueRendererSource instanceof Block)
+ setValueRendererSource(new BlockTableRendererSource(
+ (Block) objValueRendererSource));
}
}
Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/common/AbstractTableDataModel.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/common/AbstractTableDataModel.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/common/AbstractTableDataModel.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/common/AbstractTableDataModel.java Tue Mar 14 20:17:15 2006
@@ -24,72 +24,80 @@
import org.apache.tapestry.contrib.table.model.ITableDataModelListener;
/**
- * An implementation of the listener support in the ITableDataModel interface
+ * An implementation of the listener support in the ITableDataModel interface.
*
* @author mindbridge
*/
public abstract class AbstractTableDataModel implements ITableDataModel
{
- private List m_arrListeners;
- public AbstractTableDataModel()
- {
- m_arrListeners = new ArrayList();
- }
-
- /**
- * Method fireTableDataModelEvent.
- * Fires a change event to all listeners
- * @param objEvent the event to pass to the listeners
- */
- protected void fireTableDataModelEvent(CTableDataModelEvent objEvent)
- {
- synchronized (m_arrListeners) {
+ private List m_arrListeners;
+
+ public AbstractTableDataModel()
+ {
+ m_arrListeners = new ArrayList();
+ }
+
+ /**
+ * Method fireTableDataModelEvent. Fires a change event to all listeners.
+ *
+ * @param objEvent
+ * the event to pass to the listeners
+ */
+ protected void fireTableDataModelEvent(CTableDataModelEvent objEvent)
+ {
+ synchronized(m_arrListeners)
+ {
List arrEmptyReferences = null;
-
- for (Iterator it = m_arrListeners.iterator(); it.hasNext();)
- {
+
+ for(Iterator it = m_arrListeners.iterator(); it.hasNext();)
+ {
WeakReference objRef = (WeakReference) it.next();
- ITableDataModelListener objListener =
- (ITableDataModelListener) objRef.get();
- if (objListener != null)
+ ITableDataModelListener objListener = (ITableDataModelListener) objRef
+ .get();
+ if (objListener != null)
objListener.tableDataChanged(objEvent);
- else {
+ else
+ {
if (arrEmptyReferences == null)
arrEmptyReferences = new ArrayList();
arrEmptyReferences.add(objRef);
}
- }
+ }
if (arrEmptyReferences != null)
m_arrListeners.removeAll(arrEmptyReferences);
}
- }
+ }
- /**
- * @see org.apache.tapestry.contrib.table.model.ITableDataModel#addTableDataModelListener(ITableDataModelListener)
- */
- public void addTableDataModelListener(ITableDataModelListener objListener)
- {
- synchronized (m_arrListeners) {
- m_arrListeners.add(new WeakReference(objListener));
+ /**
+ * @see org.apache.tapestry.contrib.table.model.ITableDataModel#addTableDataModelListener(ITableDataModelListener).
+ */
+ public void addTableDataModelListener(ITableDataModelListener objListener)
+ {
+ synchronized(m_arrListeners)
+ {
+ m_arrListeners.add(new WeakReference(objListener));
}
- }
+ }
- /**
- * @see org.apache.tapestry.contrib.table.model.ITableDataModel#removeTableDataModelListener(ITableDataModelListener)
- */
- public void removeTableDataModelListener(ITableDataModelListener objListener)
- {
- synchronized (m_arrListeners) {
+ /**
+ * @see org.apache.tapestry.contrib.table.model.ITableDataModel#removeTableDataModelListener(ITableDataModelListener).
+ */
+ public void removeTableDataModelListener(ITableDataModelListener objListener)
+ {
+ synchronized(m_arrListeners)
+ {
List arrEmptyReferences = null;
-
- for (Iterator it = m_arrListeners.iterator(); it.hasNext();)
+
+ for(Iterator it = m_arrListeners.iterator(); it.hasNext();)
{
WeakReference objRef = (WeakReference) it.next();
- ITableDataModelListener objStoredListener =
- (ITableDataModelListener) objRef.get();
- if (objListener == objStoredListener || objStoredListener == null) {
+ ITableDataModelListener objStoredListener = (ITableDataModelListener) objRef
+ .get();
+ if (objListener == objStoredListener
+ || objStoredListener == null)
+ {
if (arrEmptyReferences == null)
arrEmptyReferences = new ArrayList();
arrEmptyReferences.add(objRef);
@@ -99,6 +107,6 @@
if (arrEmptyReferences != null)
m_arrListeners.removeAll(arrEmptyReferences);
}
- }
+ }
}
Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/common/ArrayIterator.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/common/ArrayIterator.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/common/ArrayIterator.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/common/ArrayIterator.java Tue Mar 14 20:17:15 2006
@@ -22,57 +22,55 @@
*/
public class ArrayIterator implements Iterator
{
- private Object[] m_arrValues;
- private int m_nFrom;
- private int m_nTo;
- private int m_nCurrent;
-
- public ArrayIterator(Object[] arrValues)
- {
- this(arrValues, 0, arrValues.length);
- }
-
- public ArrayIterator(Object[] arrValues, int nFrom, int nTo)
- {
- m_arrValues = arrValues;
- m_nFrom = nFrom;
- m_nTo = nTo;
-
- if (m_nFrom < 0)
- m_nFrom = 0;
- if (m_nTo < m_nFrom)
- m_nTo = m_nFrom;
- if (m_nTo > m_arrValues.length)
- m_nTo = m_arrValues.length;
-
- m_nCurrent = m_nFrom;
- }
-
- /**
- * @see java.util.Iterator#hasNext()
- */
- public boolean hasNext()
- {
- return m_nCurrent < m_nTo;
- }
-
- /**
- * @see java.util.Iterator#next()
- */
- public Object next()
- {
- //System.out.println("index: " + m_nCurrent + " size: " + m_arrValues.length + " to: " + m_nTo);
- if (!hasNext())
- throw new NoSuchElementException();
- return m_arrValues[m_nCurrent++];
- }
-
- /**
- * @see java.util.Iterator#remove()
- */
- public void remove()
- {
- throw new UnsupportedOperationException();
- }
+
+ private Object[] m_arrValues;
+ private int m_nFrom;
+ private int m_nTo;
+ private int m_nCurrent;
+
+ public ArrayIterator(Object[] arrValues)
+ {
+ this(arrValues, 0, arrValues.length);
+ }
+
+ public ArrayIterator(Object[] arrValues, int nFrom, int nTo)
+ {
+ m_arrValues = arrValues;
+ m_nFrom = nFrom;
+ m_nTo = nTo;
+
+ if (m_nFrom < 0) m_nFrom = 0;
+ if (m_nTo < m_nFrom) m_nTo = m_nFrom;
+ if (m_nTo > m_arrValues.length) m_nTo = m_arrValues.length;
+
+ m_nCurrent = m_nFrom;
+ }
+
+ /**
+ * @see java.util.Iterator#hasNext().
+ */
+ public boolean hasNext()
+ {
+ return m_nCurrent < m_nTo;
+ }
+
+ /**
+ * @see java.util.Iterator#next().
+ */
+ public Object next()
+ {
+ // System.out.println("index: " + m_nCurrent + " size: " +
+ // m_arrValues.length + " to: " + m_nTo);
+ if (!hasNext()) throw new NoSuchElementException();
+ return m_arrValues[m_nCurrent++];
+ }
+
+ /**
+ * @see java.util.Iterator#remove().
+ */
+ public void remove()
+ {
+ throw new UnsupportedOperationException();
+ }
}
Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/common/BasicTableModelWrap.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/common/BasicTableModelWrap.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/common/BasicTableModelWrap.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/common/BasicTableModelWrap.java Tue Mar 14 20:17:15 2006
@@ -24,19 +24,22 @@
/**
* @author mindbridge
*/
-public class BasicTableModelWrap extends AbstractTableModel
+public class BasicTableModelWrap extends AbstractTableModel
{
- private static final long serialVersionUID = 1L;
-
- private IBasicTableModel m_objBasicTableModel;
+
+ private static final long serialVersionUID = 1L;
+
+ private IBasicTableModel m_objBasicTableModel;
private ITableColumnModel m_objTableColumnModel;
- public BasicTableModelWrap(IBasicTableModel objBasicTableModel, ITableColumnModel objColumnModel)
+ public BasicTableModelWrap(IBasicTableModel objBasicTableModel,
+ ITableColumnModel objColumnModel)
{
this(objBasicTableModel, objColumnModel, new SimpleTableState());
}
- public BasicTableModelWrap(IBasicTableModel objBasicTableModel, ITableColumnModel objColumnModel, SimpleTableState objState)
+ public BasicTableModelWrap(IBasicTableModel objBasicTableModel,
+ ITableColumnModel objColumnModel, SimpleTableState objState)
{
super(objState);
m_objBasicTableModel = objBasicTableModel;
@@ -65,17 +68,17 @@
public Iterator getCurrentPageRows()
{
int nPageSize = getPagingState().getPageSize();
- if (nPageSize <= 0)
- nPageSize = getRowCount();
+ if (nPageSize <= 0) nPageSize = getRowCount();
int nCurrentPage = getPagingState().getCurrentPage();
int nFrom = nCurrentPage * nPageSize;
-
+
String strSortColumn = getSortingState().getSortColumn();
- ITableColumn objSortColumn = getColumnModel().getColumn(strSortColumn);
+ ITableColumn objSortColumn = getColumnModel().getColumn(strSortColumn);
boolean bSortOrder = getSortingState().getSortOrder();
-
- return m_objBasicTableModel.getCurrentPageRows(nFrom, nPageSize, objSortColumn, bSortOrder);
+
+ return m_objBasicTableModel.getCurrentPageRows(nFrom, nPageSize,
+ objSortColumn, bSortOrder);
}
}
Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/common/BlockTableRendererSource.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/common/BlockTableRendererSource.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/common/BlockTableRendererSource.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/common/BlockTableRendererSource.java Tue Mar 14 20:17:15 2006
@@ -25,102 +25,100 @@
import org.apache.tapestry.util.ComponentAddress;
/**
- *
* @author mindbridge
* @since 2.3
*/
public class BlockTableRendererSource implements ITableRendererSource
{
- private static final long serialVersionUID = 1L;
-
- private ComponentAddress m_objBlockAddress;
- private ComponentAddress m_objListenerAddress;
-
- public BlockTableRendererSource(Block objBlock)
- {
- this(new ComponentAddress(objBlock));
- }
-
- public BlockTableRendererSource(
- Block objBlock,
- ITableRendererListener objListener)
- {
- this(new ComponentAddress(objBlock), new ComponentAddress(objListener));
- }
-
- public BlockTableRendererSource(ComponentAddress objBlockAddress)
- {
- this(objBlockAddress, null);
- }
-
- public BlockTableRendererSource(
- ComponentAddress objBlockAddress,
- ComponentAddress objListenerAddress)
- {
- setBlockAddress(objBlockAddress);
- setListenerAddress(objListenerAddress);
- }
-
- /**
- * @see org.apache.tapestry.contrib.table.model.ITableRendererSource#getRenderer(IRequestCycle, ITableModelSource, ITableColumn, Object)
- */
- public IRender getRenderer(
- IRequestCycle objCycle,
- ITableModelSource objSource,
- ITableColumn objColumn,
- Object objRow)
- {
- ComponentAddress objListenerAddress = getListenerAddress();
- if (objListenerAddress != null)
- {
- ITableRendererListener objListener =
- (ITableRendererListener) objListenerAddress.findComponent(
- objCycle);
- objListener.initializeRenderer(
- objCycle,
- objSource,
- objColumn,
- objRow);
- }
-
- Block objBlock = (Block) getBlockAddress().findComponent(objCycle);
- return new BlockRenderer(objBlock);
- }
-
- /**
- * Returns the blockAddress.
- * @return ComponentAddress
- */
- public ComponentAddress getBlockAddress()
- {
- return m_objBlockAddress;
- }
-
- /**
- * Sets the blockAddress.
- * @param blockAddress The blockAddress to set
- */
- public void setBlockAddress(ComponentAddress blockAddress)
- {
- m_objBlockAddress = blockAddress;
- }
-
- /**
- * Returns the listenerAddress.
- * @return ComponentAddress
- */
- public ComponentAddress getListenerAddress()
- {
- return m_objListenerAddress;
- }
-
- /**
- * Sets the listenerAddress.
- * @param listenerAddress The listenerAddress to set
- */
- public void setListenerAddress(ComponentAddress listenerAddress)
- {
- m_objListenerAddress = listenerAddress;
- }
+
+ private static final long serialVersionUID = 1L;
+
+ private ComponentAddress m_objBlockAddress;
+ private ComponentAddress m_objListenerAddress;
+
+ public BlockTableRendererSource(Block objBlock)
+ {
+ this(new ComponentAddress(objBlock));
+ }
+
+ public BlockTableRendererSource(Block objBlock,
+ ITableRendererListener objListener)
+ {
+ this(new ComponentAddress(objBlock), new ComponentAddress(objListener));
+ }
+
+ public BlockTableRendererSource(ComponentAddress objBlockAddress)
+ {
+ this(objBlockAddress, null);
+ }
+
+ public BlockTableRendererSource(ComponentAddress objBlockAddress,
+ ComponentAddress objListenerAddress)
+ {
+ setBlockAddress(objBlockAddress);
+ setListenerAddress(objListenerAddress);
+ }
+
+ /**
+ * @see org.apache.tapestry.contrib.table.model.ITableRendererSource#getRenderer(IRequestCycle,
+ * ITableModelSource, ITableColumn, Object)
+ */
+ public IRender getRenderer(IRequestCycle objCycle,
+ ITableModelSource objSource, ITableColumn objColumn, Object objRow)
+ {
+ ComponentAddress objListenerAddress = getListenerAddress();
+ if (objListenerAddress != null)
+ {
+ ITableRendererListener objListener = (ITableRendererListener) objListenerAddress
+ .findComponent(objCycle);
+ objListener.initializeRenderer(objCycle, objSource, objColumn,
+ objRow);
+ }
+
+ Block objBlock = (Block) getBlockAddress().findComponent(objCycle);
+ return new BlockRenderer(objBlock);
+ }
+
+ /**
+ * Returns the blockAddress.
+ *
+ * @return ComponentAddress
+ */
+ public ComponentAddress getBlockAddress()
+ {
+ return m_objBlockAddress;
+ }
+
+ /**
+ * Sets the blockAddress.
+ *
+ * @param blockAddress
+ * The blockAddress to set
+ */
+ public void setBlockAddress(ComponentAddress blockAddress)
+ {
+ m_objBlockAddress = blockAddress;
+ }
+
+ /**
+ * Returns the listenerAddress.
+ *
+ * @return ComponentAddress
+ */
+ public ComponentAddress getListenerAddress()
+ {
+ return m_objListenerAddress;
+ }
+
+ /**
+ * Sets the listenerAddress.
+ *
+ * @param listenerAddress
+ * The listenerAddress to set
+ */
+ public void setListenerAddress(ComponentAddress listenerAddress)
+ {
+ m_objListenerAddress = listenerAddress;
+ }
}
Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/common/ComponentTableRendererSource.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/common/ComponentTableRendererSource.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/common/ComponentTableRendererSource.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/common/ComponentTableRendererSource.java Tue Mar 14 20:17:15 2006
@@ -23,60 +23,60 @@
import org.apache.tapestry.util.ComponentAddress;
/**
- *
* @author mindbridge
* @since 2.3
*/
public class ComponentTableRendererSource implements ITableRendererSource
{
- private static final long serialVersionUID = 1L;
-
- private ComponentAddress m_objComponentAddress;
-
- public ComponentTableRendererSource(ITableRendererListener objComponent)
- {
- this(new ComponentAddress(objComponent));
- }
-
- public ComponentTableRendererSource(ComponentAddress objComponentAddress)
- {
- setComponentAddress(objComponentAddress);
- }
-
- /**
- * @see org.apache.tapestry.contrib.table.model.ITableRendererSource#getRenderer(IRequestCycle, ITableModelSource, ITableColumn, Object)
- */
- public IRender getRenderer(
- IRequestCycle objCycle,
- ITableModelSource objSource,
- ITableColumn objColumn,
- Object objRow)
- {
- ITableRendererListener objComponent =
- (ITableRendererListener) getComponentAddress().findComponent(
- objCycle);
-
- objComponent.initializeRenderer(objCycle, objSource, objColumn, objRow);
-
- return objComponent;
- }
-
- /**
- * Returns the listenerAddress.
- * @return ComponentAddress
- */
- public ComponentAddress getComponentAddress()
- {
- return m_objComponentAddress;
- }
-
- /**
- * Sets the listenerAddress.
- * @param listenerAddress The listenerAddress to set
- */
- public void setComponentAddress(ComponentAddress listenerAddress)
- {
- m_objComponentAddress = listenerAddress;
- }
+
+ private static final long serialVersionUID = 1L;
+
+ private ComponentAddress m_objComponentAddress;
+
+ public ComponentTableRendererSource(ITableRendererListener objComponent)
+ {
+ this(new ComponentAddress(objComponent));
+ }
+
+ public ComponentTableRendererSource(ComponentAddress objComponentAddress)
+ {
+ setComponentAddress(objComponentAddress);
+ }
+
+ /**
+ * @see org.apache.tapestry.contrib.table.model.ITableRendererSource#getRenderer(IRequestCycle,
+ * ITableModelSource, ITableColumn, Object)
+ */
+ public IRender getRenderer(IRequestCycle objCycle,
+ ITableModelSource objSource, ITableColumn objColumn, Object objRow)
+ {
+ ITableRendererListener objComponent = (ITableRendererListener) getComponentAddress()
+ .findComponent(objCycle);
+
+ objComponent.initializeRenderer(objCycle, objSource, objColumn, objRow);
+
+ return objComponent;
+ }
+
+ /**
+ * Returns the listenerAddress.
+ *
+ * @return ComponentAddress
+ */
+ public ComponentAddress getComponentAddress()
+ {
+ return m_objComponentAddress;
+ }
+
+ /**
+ * Sets the listenerAddress.
+ *
+ * @param listenerAddress
+ * The listenerAddress to set
+ */
+ public void setComponentAddress(ComponentAddress listenerAddress)
+ {
+ m_objComponentAddress = listenerAddress;
+ }
}
Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/ColumnComparator.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/ColumnComparator.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/ColumnComparator.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/ColumnComparator.java Tue Mar 14 20:17:15 2006
@@ -17,48 +17,48 @@
import java.util.Comparator;
/**
- * In order to provide more generic behaviour, ITableColumn
- * has no "column value" concept. The comparator it returns
- * compares two table rows, rather than values specific to the column.
+ * In order to provide more generic behaviour, ITableColumn has no "column
+ * value" concept. The comparator it returns compares two table rows, rather
+ * than values specific to the column.
* <p>
- * SimpleTableColumn introduces the concept of "column value" and
- * allows one to extract that "column value" from the row using
- * the getColumnValue() method. In practice comparisons are also typically
- * done between these values rather than the full row objects.
+ * SimpleTableColumn introduces the concept of "column value" and allows one to
+ * extract that "column value" from the row using the getColumnValue() method.
+ * In practice comparisons are also typically done between these values rather
+ * than the full row objects.
* <p>
- * This comparator extracts the column values from the rows passed
- * and uses the provided comparator to compare the values.
- * It therefore allows a comparator designed for comparing column values to be
- * quickly wrapped and used as a comparator comparing rows, which is what
- * ITableColumn is expected to return.
+ * This comparator extracts the column values from the rows passed and uses the
+ * provided comparator to compare the values. It therefore allows a comparator
+ * designed for comparing column values to be quickly wrapped and used as a
+ * comparator comparing rows, which is what ITableColumn is expected to return.
* <p>
* Example:
* <p>
- * objColumn.setComparator(new ColumnComparator(objColumn, objBeanComparator));
+ * objColumn.setComparator(new ColumnComparator(objColumn, objBeanComparator));
*
* @author mindbridge
- *
*/
public class ColumnComparator implements Comparator
{
+
private SimpleTableColumn m_objColumn;
- private Comparator m_objComparator;
+ private Comparator m_objComparator;
- public ColumnComparator(SimpleTableColumn objColumn, Comparator objComparator)
- {
+ public ColumnComparator(SimpleTableColumn objColumn,
+ Comparator objComparator)
+ {
m_objColumn = objColumn;
- m_objComparator = objComparator;
- }
+ m_objComparator = objComparator;
+ }
- /**
- * @see java.util.Comparator#compare(Object, Object)
- */
- public int compare(Object objRow1, Object objRow2)
- {
+ /**
+ * @see java.util.Comparator#compare(Object, Object)
+ */
+ public int compare(Object objRow1, Object objRow2)
+ {
Object objValue1 = m_objColumn.getColumnValue(objRow1);
Object objValue2 = m_objColumn.getColumnValue(objRow2);
-
- return m_objComparator.compare(objValue1, objValue2);
- }
+
+ return m_objComparator.compare(objValue1, objValue2);
+ }
}
Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/valid/DateField.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/valid/DateField.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/valid/DateField.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/valid/DateField.java Tue Mar 14 20:17:15 2006
@@ -156,4 +156,4 @@
setDate((Date) value);
}
-}
\ No newline at end of file
+}
Propchange: jakarta/tapestry/trunk/examples/TimeTracker/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 14 20:17:15 2006
@@ -1,3 +1,4 @@
tapestry-timetrackerdb.lck
tapestry-timetrackerdb.script
+tapestry-timetrackerdb.properties
Modified: jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/ActivateCallback.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/ActivateCallback.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/ActivateCallback.java (original)
+++ jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/ActivateCallback.java Tue Mar 14 20:17:15 2006
@@ -29,7 +29,7 @@
{
private static final long serialVersionUID = 931074851273839081L;
- private String _pageName;
+ private String _pageName;
public ActivateCallback(IActivate page)
{
@@ -48,4 +48,4 @@
page.validate(cycle);
page.activate();
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/components/BookLink.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/components/BookLink.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/components/BookLink.java (original)
+++ jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/components/BookLink.java Tue Mar 14 20:17:15 2006
@@ -57,7 +57,7 @@
* logged in.
*/
- private static final long ONE_WEEK_MILLIS = 1000l * 60l * 60l * 24l * 7l;
+ private static final long ONE_WEEK_MILLIS = 1000L * 60L * 60L * 24L * 7L;
@Parameter(required = true)
public abstract Book getBook();
@@ -100,4 +100,4 @@
return lastAccess.compareTo(dateAdded) <= 0;
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/components/Border.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/components/Border.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/components/Border.java (original)
+++ jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/components/Border.java Tue Mar 14 20:17:15 2006
@@ -371,4 +371,4 @@
return _transferBooksRolloverImage;
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/components/Borrow.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/components/Borrow.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/components/Borrow.java (original)
+++ jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/components/Borrow.java Tue Mar 14 20:17:15 2006
@@ -130,4 +130,4 @@
return home;
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/components/Browser.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/components/Browser.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/components/Browser.java (original)
+++ jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/components/Browser.java Tue Mar 14 20:17:15 2006
@@ -230,4 +230,4 @@
setPageResults(pageResults);
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/BookMatches.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/BookMatches.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/BookMatches.java (original)
+++ jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/BookMatches.java Tue Mar 14 20:17:15 2006
@@ -136,4 +136,4 @@
return getRemoteTemplate().execute(callback, "Error processing query.");
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/BorrowedBooks.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/BorrowedBooks.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/BorrowedBooks.java (original)
+++ jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/BorrowedBooks.java Tue Mar 14 20:17:15 2006
@@ -155,4 +155,4 @@
}
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/services/BookQuerySourceImpl.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/services/BookQuerySourceImpl.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/services/BookQuerySourceImpl.java (original)
+++ jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/services/BookQuerySourceImpl.java Tue Mar 14 20:17:15 2006
@@ -24,6 +24,10 @@
import org.apache.tapestry.vlib.ejb.IBookQuery;
import org.apache.tapestry.vlib.ejb.IBookQueryHome;
+/**
+ *
+ * @author hls
+ */
public class BookQuerySourceImpl implements BookQuerySource, RemoteExceptionListener
{
private NameLookup _nameLookup;
Modified: jakarta/tapestry/trunk/examples/Vlib/src/test/org/apache/tapestry/vlib/services/RemoteTemplateTest.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Vlib/src/test/org/apache/tapestry/vlib/services/RemoteTemplateTest.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/examples/Vlib/src/test/org/apache/tapestry/vlib/services/RemoteTemplateTest.java (original)
+++ jakarta/tapestry/trunk/examples/Vlib/src/test/org/apache/tapestry/vlib/services/RemoteTemplateTest.java Tue Mar 14 20:17:15 2006
@@ -151,7 +151,7 @@
Integer bookId = new Integer(33);
IOperations operations = newOperations();
- Book book = new Book(new Object[Book.N_COLUMNS]);
+ Book book = new Book(new Object[Book.NUM_COLUMNS]);
operations.getBook(bookId);
setReturnValue(operations, book);
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=385968&r1=385967&r2=385968&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 Tue Mar 14 20:17:15 2006
@@ -29,8 +29,6 @@
public class Book implements Serializable
{
- private static final long serialVersionUID = -3423550323411938995L;
-
/**
* Column index for the Book's primary key.
*/
@@ -77,9 +75,11 @@
* Number of columns in the result.
*/
- public static final int N_COLUMNS = 14;
+ public static final int NUM_COLUMNS = 14;
+
+ private static final long serialVersionUID = -3423550323411938995L;
- private Object[] columns;
+ private Object[] _columns;
/**
* Constructs a new BookQueryResult, making an internal copy of the columns passed.
@@ -90,16 +90,16 @@
if (columns == null)
throw new IllegalArgumentException("Must provide a non-null columns.");
- if (columns.length != N_COLUMNS)
+ if (columns.length != NUM_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[NUM_COLUMNS];
+ System.arraycopy(columns, 0, this._columns, 0, NUM_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/BorrowException.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/VlibBeans/src/java/org/apache/tapestry/vlib/ejb/BorrowException.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/examples/VlibBeans/src/java/org/apache/tapestry/vlib/ejb/BorrowException.java (original)
+++ jakarta/tapestry/trunk/examples/VlibBeans/src/java/org/apache/tapestry/vlib/ejb/BorrowException.java Tue Mar 14 20:17:15 2006
@@ -25,8 +25,8 @@
{
private static final long serialVersionUID = 7761447010967099141L;
- public BorrowException(String message)
+ public BorrowException(String message)
{
super(message);
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/examples/VlibBeans/src/java/org/apache/tapestry/vlib/ejb/impl/AbstractEntityBean.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/VlibBeans/src/java/org/apache/tapestry/vlib/ejb/impl/AbstractEntityBean.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/examples/VlibBeans/src/java/org/apache/tapestry/vlib/ejb/impl/AbstractEntityBean.java (original)
+++ jakarta/tapestry/trunk/examples/VlibBeans/src/java/org/apache/tapestry/vlib/ejb/impl/AbstractEntityBean.java Tue Mar 14 20:17:15 2006
@@ -27,11 +27,12 @@
import javax.naming.NamingException;
import javax.rmi.PortableRemoteObject;
+import ognl.Ognl;
+import ognl.OgnlException;
+
import org.apache.tapestry.contrib.ejb.XEJBException;
import org.apache.tapestry.vlib.ejb.IKeyAllocator;
import org.apache.tapestry.vlib.ejb.IKeyAllocatorHome;
-import ognl.Ognl;
-import ognl.OgnlException;
/**
* Provides basic support for the entity context, empty or minimal implementations of the required
@@ -272,4 +273,4 @@
{
return _context;
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/examples/VlibBeans/src/java/org/apache/tapestry/vlib/ejb/impl/BookBean.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/VlibBeans/src/java/org/apache/tapestry/vlib/ejb/impl/BookBean.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/examples/VlibBeans/src/java/org/apache/tapestry/vlib/ejb/impl/BookBean.java (original)
+++ jakarta/tapestry/trunk/examples/VlibBeans/src/java/org/apache/tapestry/vlib/ejb/impl/BookBean.java Tue Mar 14 20:17:15 2006
@@ -102,4 +102,4 @@
// No post create work needed but the method must be implemented
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/examples/VlibBeans/src/java/org/apache/tapestry/vlib/ejb/impl/BookQueryBean.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/VlibBeans/src/java/org/apache/tapestry/vlib/ejb/impl/BookQueryBean.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/examples/VlibBeans/src/java/org/apache/tapestry/vlib/ejb/impl/BookQueryBean.java (original)
+++ jakarta/tapestry/trunk/examples/VlibBeans/src/java/org/apache/tapestry/vlib/ejb/impl/BookQueryBean.java Tue Mar 14 20:17:15 2006
@@ -45,7 +45,7 @@
{
private static final long serialVersionUID = 8782046868254488388L;
- /**
+ /**
* Stores the results from the most recent query.
*/
@@ -273,7 +273,7 @@
private void processQueryResults(ResultSet set) throws SQLException
{
List list = new ArrayList();
- Object[] columns = new Object[Book.N_COLUMNS];
+ Object[] columns = new Object[Book.NUM_COLUMNS];
while (set.next())
{
@@ -356,4 +356,4 @@
return assembly.createStatement(connection);
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/examples/VlibBeans/src/java/org/apache/tapestry/vlib/ejb/impl/OperationsBean.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/VlibBeans/src/java/org/apache/tapestry/vlib/ejb/impl/OperationsBean.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/examples/VlibBeans/src/java/org/apache/tapestry/vlib/ejb/impl/OperationsBean.java (original)
+++ jakarta/tapestry/trunk/examples/VlibBeans/src/java/org/apache/tapestry/vlib/ejb/impl/OperationsBean.java Tue Mar 14 20:17:15 2006
@@ -503,7 +503,7 @@
if (!set.next())
throw new FinderException("Book " + bookId + " does not exist.");
- Object[] columns = new Object[Book.N_COLUMNS];
+ Object[] columns = new Object[Book.NUM_COLUMNS];
result = convertRowToBook(set, columns);
}
Modified: jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/chart/ChartService.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/chart/ChartService.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/chart/ChartService.java (original)
+++ jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/chart/ChartService.java Tue Mar 14 20:17:15 2006
@@ -134,4 +134,4 @@
{
_response = response;
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/components/Border.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/components/Border.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/components/Border.java (original)
+++ jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/components/Border.java Tue Mar 14 20:17:15 2006
@@ -134,4 +134,4 @@
cycle.activate(newPageName);
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/ApplicationServlet.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/ApplicationServlet.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/ApplicationServlet.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/ApplicationServlet.java Tue Mar 14 20:17:15 2006
@@ -320,4 +320,4 @@
_registry = null;
}
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/BaseComponent.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/BaseComponent.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/BaseComponent.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/BaseComponent.java Tue Mar 14 20:17:15 2006
@@ -108,4 +108,4 @@
super.finishLoad(cycle, loader, specification);
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/BindingException.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/BindingException.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/BindingException.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/BindingException.java Tue Mar 14 20:17:15 2006
@@ -30,7 +30,7 @@
{
private static final long serialVersionUID = 1336659143140967861L;
- private transient IBinding _binding;
+ private final transient IBinding _binding;
public BindingException(String message, IBinding binding)
{
@@ -63,4 +63,4 @@
{
return _binding;
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/ConfigurationDefaults.properties
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/ConfigurationDefaults.properties?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/ConfigurationDefaults.properties (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/ConfigurationDefaults.properties Tue Mar 14 20:17:15 2006
@@ -14,4 +14,4 @@
org.apache.tapestry.default-script-language=jython
org.apache.tapestry.visit-class=java.util.HashMap
-org.apache.tapestry.output-encoding=UTF-8
\ No newline at end of file
+org.apache.tapestry.output-encoding=UTF-8
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/Constants.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/Constants.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/Constants.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/Constants.java Tue Mar 14 20:17:15 2006
@@ -15,16 +15,18 @@
package org.apache.tapestry;
/**
- * Constant values used inside Tapestry.
- *
+ * Constant values used inside Tapestry.
+ *
* @author Howard Lewis Ship
* @since 4.0
*/
public final class Constants
{
- /**
- * Key used to store and locate an {@link org.apache.tapestry.services.Infrastructure}
- * service instance as a request attribute.
- */
- public static final String INFRASTRUCTURE_KEY = "org.apache.tapestry.Infrastructure";
+
+ /**
+ * Key used to store and locate an
+ * {@link org.apache.tapestry.services.Infrastructure} service instance as a
+ * request attribute.
+ */
+ public static final String INFRASTRUCTURE_KEY = "org.apache.tapestry.Infrastructure";
}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/bean/AbstractBeanInitializer.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/bean/AbstractBeanInitializer.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/bean/AbstractBeanInitializer.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/bean/AbstractBeanInitializer.java Tue Mar 14 20:17:15 2006
@@ -26,7 +26,7 @@
* @since 1.0.5
*/
-abstract public class AbstractBeanInitializer extends BaseLocatable implements IBeanInitializer
+public abstract class AbstractBeanInitializer extends BaseLocatable implements IBeanInitializer
{
protected String _propertyName;
@@ -60,4 +60,4 @@
}
}
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org