You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2010/08/19 22:51:55 UTC
svn commit: r987308 - in /tapestry/tapestry5/trunk/tapestry-core/src:
main/java/org/apache/tapestry5/corelib/components/
main/java/org/apache/tapestry5/internal/util/
test/java/org/apache/tapestry5/internal/util/
Author: hlship
Date: Thu Aug 19 20:51:55 2010
New Revision: 987308
URL: http://svn.apache.org/viewvc?rev=987308&view=rev
Log:
TAP5-1244: Recode AutofocusValidationDecorator to use JavaScriptSupport, not RenderSupport
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Form.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/AutofocusValidationDecorator.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/util/AutofocusValidationDecoratorTest.java
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Form.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Form.java?rev=987308&r1=987307&r2=987308&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Form.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Form.java Thu Aug 19 20:51:55 2010
@@ -223,7 +223,7 @@ public class Form implements ClientEleme
private JavaScriptSupport javascriptSupport;
@Environmental
- private RenderSupport renderSupport;
+ private JavaScriptSupport jsSupport;
@Inject
private Request request;
@@ -379,7 +379,7 @@ public class Form implements ClientEleme
if (autofocus)
{
ValidationDecorator autofocusDecorator = new AutofocusValidationDecorator(
- environment.peek(ValidationDecorator.class), activeTracker, renderSupport);
+ environment.peek(ValidationDecorator.class), activeTracker, jsSupport);
environment.push(ValidationDecorator.class, autofocusDecorator);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/AutofocusValidationDecorator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/AutofocusValidationDecorator.java?rev=987308&r1=987307&r2=987308&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/AutofocusValidationDecorator.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/AutofocusValidationDecorator.java Thu Aug 19 20:51:55 2010
@@ -1,10 +1,10 @@
-// Copyright 2008 The Apache Software Foundation
+// Copyright 2008, 2010 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,7 +14,11 @@
package org.apache.tapestry5.internal.util;
-import org.apache.tapestry5.*;
+import org.apache.tapestry5.Field;
+import org.apache.tapestry5.FieldFocusPriority;
+import org.apache.tapestry5.ValidationDecorator;
+import org.apache.tapestry5.ValidationTracker;
+import org.apache.tapestry5.services.javascript.JavaScriptSupport;
/**
* Used by {@link org.apache.tapestry5.corelib.components.Form} to determine which fields will be focused and a what
@@ -24,14 +28,14 @@ public class AutofocusValidationDecorato
{
private final ValidationTracker tracker;
- private final RenderSupport renderSupport;
+ private final JavaScriptSupport jsSupport;
public AutofocusValidationDecorator(ValidationDecorator delegate, ValidationTracker tracker,
- RenderSupport renderSupport)
+ JavaScriptSupport javascriptSupport)
{
super(delegate);
this.tracker = tracker;
- this.renderSupport = renderSupport;
+ this.jsSupport = javascriptSupport;
}
@Override
@@ -41,15 +45,17 @@ public class AutofocusValidationDecorato
if (!field.isDisabled())
{
- renderSupport.autofocus(getPriority(field), field.getClientId());
+ jsSupport.autofocus(getPriority(field), field.getClientId());
}
}
private FieldFocusPriority getPriority(Field field)
{
- if (tracker.inError(field)) return FieldFocusPriority.IN_ERROR;
+ if (tracker.inError(field))
+ return FieldFocusPriority.IN_ERROR;
- if (field.isRequired()) return FieldFocusPriority.REQUIRED;
+ if (field.isRequired())
+ return FieldFocusPriority.REQUIRED;
return FieldFocusPriority.OPTIONAL;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/util/AutofocusValidationDecoratorTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/util/AutofocusValidationDecoratorTest.java?rev=987308&r1=987307&r2=987308&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/util/AutofocusValidationDecoratorTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/util/AutofocusValidationDecoratorTest.java Thu Aug 19 20:51:55 2010
@@ -1,10 +1,10 @@
-// Copyright 2008 The Apache Software Foundation
+// Copyright 2008, 2010 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,7 +14,11 @@
package org.apache.tapestry5.internal.util;
-import org.apache.tapestry5.*;
+import org.apache.tapestry5.Field;
+import org.apache.tapestry5.FieldFocusPriority;
+import org.apache.tapestry5.ValidationDecorator;
+import org.apache.tapestry5.ValidationTracker;
+import org.apache.tapestry5.services.javascript.JavaScriptSupport;
import org.apache.tapestry5.test.TapestryTestCase;
import org.testng.annotations.Test;
@@ -26,7 +30,7 @@ public class AutofocusValidationDecorato
Field field = mockField();
ValidationDecorator delegate = mockValidationDecorator();
ValidationTracker tracker = mockValidationTracker();
- RenderSupport renderSupport = mockRenderSupport();
+ JavaScriptSupport jsSupport = mockJavaScriptSupport();
delegate.insideField(field);
@@ -34,7 +38,7 @@ public class AutofocusValidationDecorato
replay();
- ValidationDecorator decorator = new AutofocusValidationDecorator(delegate, tracker, renderSupport);
+ ValidationDecorator decorator = new AutofocusValidationDecorator(delegate, tracker, jsSupport);
decorator.insideField(field);
@@ -47,7 +51,7 @@ public class AutofocusValidationDecorato
Field field = mockField();
ValidationDecorator delegate = mockValidationDecorator();
ValidationTracker tracker = mockValidationTracker();
- RenderSupport renderSupport = mockRenderSupport();
+ JavaScriptSupport jsSupport = mockJavaScriptSupport();
delegate.insideField(field);
@@ -56,11 +60,11 @@ public class AutofocusValidationDecorato
train_getClientId(field, "foo");
- renderSupport.autofocus(FieldFocusPriority.IN_ERROR, "foo");
+ jsSupport.autofocus(FieldFocusPriority.IN_ERROR, "foo");
replay();
- ValidationDecorator decorator = new AutofocusValidationDecorator(delegate, tracker, renderSupport);
+ ValidationDecorator decorator = new AutofocusValidationDecorator(delegate, tracker, jsSupport);
decorator.insideField(field);
@@ -73,7 +77,7 @@ public class AutofocusValidationDecorato
Field field = mockField();
ValidationDecorator delegate = mockValidationDecorator();
ValidationTracker tracker = mockValidationTracker();
- RenderSupport renderSupport = mockRenderSupport();
+ JavaScriptSupport jsSupport = mockJavaScriptSupport();
delegate.insideField(field);
@@ -84,11 +88,11 @@ public class AutofocusValidationDecorato
train_getClientId(field, "foo");
- renderSupport.autofocus(FieldFocusPriority.REQUIRED, "foo");
+ jsSupport.autofocus(FieldFocusPriority.REQUIRED, "foo");
replay();
- ValidationDecorator decorator = new AutofocusValidationDecorator(delegate, tracker, renderSupport);
+ ValidationDecorator decorator = new AutofocusValidationDecorator(delegate, tracker, jsSupport);
decorator.insideField(field);
@@ -101,7 +105,7 @@ public class AutofocusValidationDecorato
Field field = mockField();
ValidationDecorator delegate = mockValidationDecorator();
ValidationTracker tracker = mockValidationTracker();
- RenderSupport renderSupport = mockRenderSupport();
+ JavaScriptSupport jsSupport = mockJavaScriptSupport();
delegate.insideField(field);
@@ -112,11 +116,11 @@ public class AutofocusValidationDecorato
train_getClientId(field, "foo");
- renderSupport.autofocus(FieldFocusPriority.OPTIONAL, "foo");
+ jsSupport.autofocus(FieldFocusPriority.OPTIONAL, "foo");
replay();
- ValidationDecorator decorator = new AutofocusValidationDecorator(delegate, tracker, renderSupport);
+ ValidationDecorator decorator = new AutofocusValidationDecorator(delegate, tracker, jsSupport);
decorator.insideField(field);