You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2010/07/28 19:33:16 UTC
svn commit: r980130 [1/2] - in /tapestry/tapestry5/trunk/tapestry-core/src:
main/java/org/apache/tapestry5/ main/java/org/apache/tapestry5/annotations/
main/java/org/apache/tapestry5/corelib/components/
main/java/org/apache/tapestry5/corelib/mixins/ ma...
Author: hlship
Date: Wed Jul 28 17:33:14 2010
New Revision: 980130
URL: http://svn.apache.org/viewvc?rev=980130&view=rev
Log:
TAP5-1223: The name "JavaScript" should have a capital "S" but is inconsistent in some class and interface names
Added:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ajax/JSSupportImpl.java (contents, props changed)
- copied, changed from r979956, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ajax/JavascriptSupportImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JSStackPathConstructor.java (contents, props changed)
- copied, changed from r979956, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JavascriptStackPathConstructor.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JSStackPathConstructorImpl.java (contents, props changed)
- copied, changed from r979956, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JavascriptStackPathConstructorImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JSStackSourceImpl.java (contents, props changed)
- copied, changed from r979956, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JavascriptStackSourceImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JSStack.java (contents, props changed)
- copied, changed from r979956, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavascriptStack.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JSStackSource.java (contents, props changed)
- copied, changed from r979956, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavascriptStackSource.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JSSupport.java (contents, props changed)
- copied, changed from r979956, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavascriptSupport.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ajax/JSSupportImplTest.java (contents, props changed)
- copied, changed from r979956, tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ajax/JavascriptSupportImplTest.java
Removed:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ajax/JavascriptSupportImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JavascriptStackPathConstructor.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JavascriptStackPathConstructorImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JavascriptStackSourceImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavascriptStack.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavascriptStackSource.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavascriptSupport.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ajax/JavascriptSupportImplTest.java
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/RenderSupport.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Import.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Any.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/DateField.java
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/corelib/components/FormFragment.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormInjector.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/LinkSubmit.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Palette.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Select.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Submit.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Zone.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/TriggerFragment.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalConstants.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClientBehaviorSupportImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalModule.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RenderSupportImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestConstants.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/StackAssetRequestHandler.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/CoreJavascriptStack.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/DateFieldStack.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/AbstractIncludeAssetWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ImportWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/IncludeJavaScriptLibraryWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/translator/NumericTranslatorSupportImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ClientInfrastructure.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StylesheetLink.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/test/TapestryTestCase.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/AnyTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/nested/AssetDemo.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClientBehaviorSupportImplTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RenderSupportImplTest.java
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/RenderSupport.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/RenderSupport.java?rev=980130&r1=980129&r2=980130&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/RenderSupport.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/RenderSupport.java Wed Jul 28 17:33:14 2010
@@ -20,7 +20,7 @@ import org.apache.tapestry5.json.JSONArr
import org.apache.tapestry5.json.JSONObject;
import org.apache.tapestry5.services.AssetSource;
import org.apache.tapestry5.services.EnvironmentalShadowBuilder;
-import org.apache.tapestry5.services.javascript.JavascriptSupport;
+import org.apache.tapestry5.services.javascript.JSSupport;
/**
* Provides support to all components that render. This is primarily about generating unique client-side ids (very
@@ -31,7 +31,7 @@ import org.apache.tapestry5.services.jav
* The scripting statements added to this block will be executed, on the client, only once the page has fully loaded.
* <p>
* The methods in this interface are largely being replaced with a new environmental interface,
- * {@link JavascriptSupport}.
+ * {@link JSSupport}.
* <p>
* RenderSupport is normally accessed within a component by using the {@link Environmental} annotation on a component
* field. In addition, RenderSupport may also be accessed as a service (the service
@@ -48,8 +48,8 @@ public interface RenderSupport
* the component id from which a unique id will be generated
* @return a unique id for this rendering of the page
* @see org.apache.tapestry5.ioc.util.IdAllocator
- * @see JavascriptSupport#allocateClientId(ComponentResources)
- * @deprecated Use {@link JavascriptSupport#allocateClientId(String)} instead
+ * @see JSSupport#allocateClientId(ComponentResources)
+ * @deprecated Use {@link JSSupport#allocateClientId(String)} instead
*/
String allocateClientId(String id);
@@ -59,7 +59,7 @@ public interface RenderSupport
* @param resources
* of the component which requires an id
* @return a unique id for this rendering of the page
- * @deprecated Use {@link JavascriptSupport#allocateClientId(ComponentResources)} instead
+ * @deprecated Use {@link JSSupport#allocateClientId(ComponentResources)} instead
*/
String allocateClientId(ComponentResources resources);
@@ -70,7 +70,7 @@ public interface RenderSupport
*
* @param scriptAssets
* asset to the script to add
- * @deprecated Use {@link JavascriptSupport#importJavascriptLibrary(Asset)} instead
+ * @deprecated Use {@link JSSupport#importJavascriptLibrary(Asset)} instead
*/
void addScriptLink(Asset... scriptAssets);
@@ -80,7 +80,7 @@ public interface RenderSupport
*
* @param scriptURLs
* URL strings of scripts
- * @deprecated Use {@link JavascriptSupport#importJavascriptLibrary(String)} instead
+ * @deprecated Use {@link JSSupport#importJavaScriptLibrary(String)} instead
* @throws RuntimeException
* <strong>always</strong> as of 5.2.0
*/
@@ -93,7 +93,7 @@ public interface RenderSupport
* @param classpaths
* array of paths. Symbols in the paths are expanded, then the paths are each converted into an
* asset.
- * @deprecated Use {@link JavascriptSupport#importJavascriptLibrary(Asset)} instead
+ * @deprecated Use {@link JSSupport#importJavascriptLibrary(Asset)} instead
*/
void addClasspathScriptLink(String... classpaths);
@@ -125,7 +125,7 @@ public interface RenderSupport
*
* @param script
* text to be added to the script block
- * @deprecated Use {@link JavascriptSupport#addScript(String, Object...)} instead
+ * @deprecated Use {@link JSSupport#addScript(String, Object...)} instead
*/
void addScript(String script);
@@ -138,7 +138,7 @@ public interface RenderSupport
* base string format, to be passed through String.format
* @param arguments
* additional arguments formatted to form the final script
- * @deprecated Use {@link JavascriptSupport#addScript(String, Object...)} instead
+ * @deprecated Use {@link JSSupport#addScript(String, Object...)} instead
*/
void addScript(String format, Object... arguments);
@@ -151,7 +151,7 @@ public interface RenderSupport
* @param parameterList
* list of parameters for the method invocation.
* @see #addScript(String, Object[])
- * @deprecated Use {@link JavascriptSupport#addInitializerCall(String, JSONObject)} instead (which may require
+ * @deprecated Use {@link JSSupport#addInitializerCall(String, JSONObject)} instead (which may require
* changes to your JavaScript initializer function)
*/
void addInit(String functionName, JSONArray parameterList);
@@ -164,7 +164,7 @@ public interface RenderSupport
* the name of the function (on the client-side Tapestry object) to invoke.
* @param parameter
* the object to pass to the function
- * @deprecated Use {@link JavascriptSupport#addInitializerCall(String, JSONObject)} instead
+ * @deprecated Use {@link JSSupport#addInitializerCall(String, JSONObject)} instead
*/
void addInit(String functionName, JSONObject parameter);
@@ -177,9 +177,9 @@ public interface RenderSupport
* @param functionName
* the name of the function (on the client-side Tapestry object) to invoke.
* @param parameters
- * @deprecated Use {@link JavascriptSupport#addInitializerCall(String, JSONObject)} instead (which may require
+ * @deprecated Use {@link JSSupport#addInitializerCall(String, JSONObject)} instead (which may require
* changes to your JavaScript initializer function), or (for a single parameter)
- * {@link JavascriptSupport#addInitializerCall(String, String)}
+ * {@link JSSupport#addInitializerCall(String, String)}
*/
void addInit(String functionName, String... parameters);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java?rev=980130&r1=980129&r2=980130&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java Wed Jul 28 17:33:14 2010
@@ -17,7 +17,7 @@ package org.apache.tapestry5;
import org.apache.tapestry5.internal.services.AssetDispatcher;
import org.apache.tapestry5.services.ComponentClassTransformWorker;
import org.apache.tapestry5.services.assets.AssetPathConstructor;
-import org.apache.tapestry5.services.javascript.JavascriptStack;
+import org.apache.tapestry5.services.javascript.JSStack;
/**
* Defines the names of symbols used to configure Tapestry.
@@ -190,7 +190,7 @@ public class SymbolConstants
public static final String ENCODE_LOCALE_INTO_PATH = "tapestry.encode-locale-into-path";
/**
- * If "true" then Javascript files in a {@link JavascriptStack} will be combined into a single virtual JavaScript
+ * If "true" then Javascript files in a {@link JSStack} will be combined into a single virtual JavaScript
* file. Defaults to "true" in production mode.
*
* @since 5.1.0.2
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Import.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Import.java?rev=980130&r1=980129&r2=980130&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Import.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Import.java Wed Jul 28 17:33:14 2010
@@ -26,8 +26,8 @@ import java.lang.annotation.Target;
import org.apache.tapestry5.ioc.annotations.UseWith;
import org.apache.tapestry5.runtime.Component;
-import org.apache.tapestry5.services.javascript.JavascriptStack;
-import org.apache.tapestry5.services.javascript.JavascriptSupport;
+import org.apache.tapestry5.services.javascript.JSStack;
+import org.apache.tapestry5.services.javascript.JSSupport;
/**
* Annotations to control the importing of JavaScript stacks and libraries as well as stylesheets. This annotation may
@@ -37,7 +37,7 @@ import org.apache.tapestry5.services.jav
* <p>
* Assets are localized during the {@link Component#containingPageDidLoad()} lifecycle method.
*
- * @see JavascriptSupport
+ * @see JSSupport
* @since 5.2.0
*/
@Target(
@@ -51,8 +51,8 @@ public @interface Import
/**
* Javascript Stacks to import. Stacks are imported before individual libraries.
*
- * @see JavascriptStack
- * @see JavascriptSupport#importStack(String)
+ * @see JSStack
+ * @see JSSupport#importStack(String)
*/
String[] stack() default
{};
@@ -61,7 +61,7 @@ public @interface Import
* Javascript libraries to import. Each value is an asset path; symbols in each path are expanded. The library may
* be localized.
*
- * @see JavascriptSupport#importJavascriptLibrary(org.apache.tapestry5.Asset)
+ * @see JSSupport#importJavascriptLibrary(org.apache.tapestry5.Asset)
*/
String[] library() default
{};
@@ -70,7 +70,7 @@ public @interface Import
* Stylesheets to import. Each value is an asset path; symbols in each path are expanded. The stylesheet may be
* localized. The stylesheet is imported with no options.
*
- * @see JavascriptSupport#importStylesheet(org.apache.tapestry5.Asset,
+ * @see JSSupport#importStylesheet(org.apache.tapestry5.Asset,
* org.apache.tapestry5.services.javascript.StylesheetOptions)
*/
String[] stylesheet() default
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Any.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Any.java?rev=980130&r1=980129&r2=980130&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Any.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Any.java Wed Jul 28 17:33:14 2010
@@ -19,7 +19,7 @@ import org.apache.tapestry5.annotations.
import org.apache.tapestry5.annotations.SupportsInformalParameters;
import org.apache.tapestry5.dom.Element;
import org.apache.tapestry5.ioc.annotations.Inject;
-import org.apache.tapestry5.services.javascript.JavascriptSupport;
+import org.apache.tapestry5.services.javascript.JSSupport;
/**
* Renders an arbitrary element including informal parameters.
@@ -44,7 +44,7 @@ public class Any implements ClientElemen
private ComponentResources resources;
@Inject
- private JavascriptSupport javascriptSupport;
+ private JSSupport javascriptSupport;
String defaultElement()
{
@@ -89,7 +89,7 @@ public class Any implements ClientElemen
writer.end(); // the element
}
- void inject(JavascriptSupport javascriptSupport, ComponentResources resources, String element, String clientId)
+ void inject(JSSupport javascriptSupport, ComponentResources resources, String element, String clientId)
{
this.javascriptSupport = javascriptSupport;
this.resources = resources;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/DateField.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/DateField.java?rev=980130&r1=980129&r2=980130&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/DateField.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/DateField.java Wed Jul 28 17:33:14 2010
@@ -33,7 +33,7 @@ import org.apache.tapestry5.ioc.internal
import org.apache.tapestry5.json.JSONObject;
import org.apache.tapestry5.services.ComponentDefaultProvider;
import org.apache.tapestry5.services.Request;
-import org.apache.tapestry5.services.javascript.JavascriptSupport;
+import org.apache.tapestry5.services.javascript.JSSupport;
/**
* A component used to collect a provided date from the user using a client-side JavaScript calendar. Non-JavaScript
@@ -92,7 +92,7 @@ public class DateField extends AbstractF
private Messages messages;
@Environmental
- private JavascriptSupport support;
+ private JSSupport support;
@Environmental
private ValidationTracker tracker;
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=980130&r1=980129&r2=980130&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 Wed Jul 28 17:33:14 2010
@@ -54,7 +54,7 @@ import org.apache.tapestry5.services.Env
import org.apache.tapestry5.services.FormSupport;
import org.apache.tapestry5.services.Heartbeat;
import org.apache.tapestry5.services.Request;
-import org.apache.tapestry5.services.javascript.JavascriptSupport;
+import org.apache.tapestry5.services.javascript.JSSupport;
import org.slf4j.Logger;
/**
@@ -220,7 +220,7 @@ public class Form implements ClientEleme
private Messages messages;
@Environmental
- private JavascriptSupport javascriptSupport;
+ private JSSupport javascriptSupport;
@Environmental
private RenderSupport renderSupport;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormFragment.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormFragment.java?rev=980130&r1=980129&r2=980130&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormFragment.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormFragment.java Wed Jul 28 17:33:14 2010
@@ -33,7 +33,7 @@ import org.apache.tapestry5.services.Cli
import org.apache.tapestry5.services.Environment;
import org.apache.tapestry5.services.FormSupport;
import org.apache.tapestry5.services.HiddenFieldLocationRules;
-import org.apache.tapestry5.services.javascript.JavascriptSupport;
+import org.apache.tapestry5.services.javascript.JSSupport;
import org.slf4j.Logger;
/**
@@ -109,7 +109,7 @@ public class FormFragment implements Cli
private Environment environment;
@Environmental
- private JavascriptSupport javascriptSupport;
+ private JSSupport javascriptSupport;
@Inject
private ComponentResources resources;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormInjector.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormInjector.java?rev=980130&r1=980129&r2=980130&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormInjector.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormInjector.java Wed Jul 28 17:33:14 2010
@@ -41,7 +41,7 @@ import org.apache.tapestry5.services.Hea
import org.apache.tapestry5.services.HiddenFieldLocationRules;
import org.apache.tapestry5.services.PartialMarkupRenderer;
import org.apache.tapestry5.services.PartialMarkupRendererFilter;
-import org.apache.tapestry5.services.javascript.JavascriptSupport;
+import org.apache.tapestry5.services.javascript.JSSupport;
import org.slf4j.Logger;
/**
@@ -95,7 +95,7 @@ public class FormInjector implements Cli
private String element;
@Environmental
- private JavascriptSupport javascriptSupport;
+ private JSSupport javascriptSupport;
@Environmental
private FormSupport formSupport;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/LinkSubmit.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/LinkSubmit.java?rev=980130&r1=980129&r2=980130&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/LinkSubmit.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/LinkSubmit.java Wed Jul 28 17:33:14 2010
@@ -32,7 +32,7 @@ import org.apache.tapestry5.services.For
import org.apache.tapestry5.services.Heartbeat;
import org.apache.tapestry5.services.Request;
import org.apache.tapestry5.services.javascript.InitializationPriority;
-import org.apache.tapestry5.services.javascript.JavascriptSupport;
+import org.apache.tapestry5.services.javascript.JSSupport;
/**
* Generates a client-side hyperlink that submits the enclosing form. If the link is clicked in the browser, the
@@ -88,7 +88,7 @@ public class LinkSubmit implements Clien
private ComponentResources resources;
@Inject
- private JavascriptSupport javascriptSupport;
+ private JSSupport javascriptSupport;
@Environmental
private FormSupport formSupport;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Palette.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Palette.java?rev=980130&r1=980129&r2=980130&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Palette.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Palette.java Wed Jul 28 17:33:14 2010
@@ -35,7 +35,7 @@ import org.apache.tapestry5.ioc.internal
import org.apache.tapestry5.json.JSONArray;
import org.apache.tapestry5.services.ComponentDefaultProvider;
import org.apache.tapestry5.services.Request;
-import org.apache.tapestry5.services.javascript.JavascriptSupport;
+import org.apache.tapestry5.services.javascript.JSSupport;
/**
* Multiple selection component. Generates a UI consisting of two <select> elements configured for multiple
@@ -220,7 +220,7 @@ public class Palette extends AbstractFie
* Used to include scripting code in the rendered page.
*/
@Environmental
- private JavascriptSupport javascriptSupport;
+ private JSSupport javascriptSupport;
@Environmental
private ValidationTracker tracker;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Select.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Select.java?rev=980130&r1=980129&r2=980130&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Select.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Select.java Wed Jul 28 17:33:14 2010
@@ -37,7 +37,7 @@ import org.apache.tapestry5.services.For
import org.apache.tapestry5.services.Request;
import org.apache.tapestry5.services.ValueEncoderFactory;
import org.apache.tapestry5.services.ValueEncoderSource;
-import org.apache.tapestry5.services.javascript.JavascriptSupport;
+import org.apache.tapestry5.services.javascript.JSSupport;
import org.apache.tapestry5.util.EnumSelectModel;
/**
@@ -145,7 +145,7 @@ public class Select extends AbstractFiel
private FormSupport formSupport;
@Inject
- private JavascriptSupport javascriptSupport;
+ private JSSupport javascriptSupport;
@SuppressWarnings("unused")
@Mixin
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Submit.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Submit.java?rev=980130&r1=980129&r2=980130&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Submit.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Submit.java Wed Jul 28 17:33:14 2010
@@ -25,7 +25,7 @@ import org.apache.tapestry5.ioc.annotati
import org.apache.tapestry5.services.FormSupport;
import org.apache.tapestry5.services.Heartbeat;
import org.apache.tapestry5.services.Request;
-import org.apache.tapestry5.services.javascript.JavascriptSupport;
+import org.apache.tapestry5.services.javascript.JSSupport;
/**
* Corresponds to <input type="submit"> or <input type="image">, a client-side element that can force the
@@ -99,7 +99,7 @@ public class Submit implements ClientEle
private Request request;
@Inject
- private JavascriptSupport javascriptSupport;
+ private JSSupport javascriptSupport;
@SuppressWarnings("unchecked")
@Environmental
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Zone.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Zone.java?rev=980130&r1=980129&r2=980130&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Zone.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Zone.java Wed Jul 28 17:33:14 2010
@@ -37,7 +37,7 @@ import org.apache.tapestry5.services.Env
import org.apache.tapestry5.services.FormSupport;
import org.apache.tapestry5.services.Heartbeat;
import org.apache.tapestry5.services.HiddenFieldLocationRules;
-import org.apache.tapestry5.services.javascript.JavascriptSupport;
+import org.apache.tapestry5.services.javascript.JSSupport;
import org.slf4j.Logger;
/**
@@ -112,7 +112,7 @@ public class Zone implements ClientEleme
private String idParameter;
@Environmental
- private JavascriptSupport javascriptSupport;
+ private JSSupport javascriptSupport;
@Environmental
private ClientBehaviorSupport clientBehaviorSupport;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/TriggerFragment.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/TriggerFragment.java?rev=980130&r1=980129&r2=980130&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/TriggerFragment.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/TriggerFragment.java Wed Jul 28 17:33:14 2010
@@ -23,7 +23,7 @@ import org.apache.tapestry5.annotations.
import org.apache.tapestry5.annotations.Parameter;
import org.apache.tapestry5.json.JSONObject;
import org.apache.tapestry5.services.Heartbeat;
-import org.apache.tapestry5.services.javascript.JavascriptSupport;
+import org.apache.tapestry5.services.javascript.JSSupport;
/**
* A mixin that can be applied to a {@link org.apache.tapestry5.corelib.components.Checkbox} or
@@ -53,7 +53,7 @@ public class TriggerFragment
private boolean invert;
@Environmental
- private JavascriptSupport javascriptSupport;
+ private JSSupport javascriptSupport;
@HeartbeatDeferred
void beginRender()
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalConstants.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalConstants.java?rev=980130&r1=980129&r2=980130&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalConstants.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalConstants.java Wed Jul 28 17:33:14 2010
@@ -15,7 +15,7 @@
package org.apache.tapestry5.internal;
import org.apache.tapestry5.ioc.util.TimeInterval;
-import org.apache.tapestry5.services.javascript.JavascriptStack;
+import org.apache.tapestry5.services.javascript.JSStack;
public final class InternalConstants
{
@@ -133,7 +133,7 @@ public final class InternalConstants
public static final String[] EMPTY_STRING_ARRAY = new String[0];
/**
- * Name of the core {@link JavascriptStack}, which supplies the basic JavaScript infrastructure
+ * Name of the core {@link JSStack}, which supplies the basic JavaScript infrastructure
* on the client.
*
* @since 5.2.0
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClientBehaviorSupportImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClientBehaviorSupportImpl.java?rev=980130&r1=980129&r2=980130&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClientBehaviorSupportImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClientBehaviorSupportImpl.java Wed Jul 28 17:33:14 2010
@@ -22,17 +22,17 @@ import org.apache.tapestry5.json.JSONObj
import org.apache.tapestry5.services.ClientBehaviorSupport;
import org.apache.tapestry5.services.Environment;
import org.apache.tapestry5.services.FormSupport;
-import org.apache.tapestry5.services.javascript.JavascriptSupport;
+import org.apache.tapestry5.services.javascript.JSSupport;
public class ClientBehaviorSupportImpl implements ClientBehaviorSupport
{
- private final JavascriptSupport javascriptSupport;
+ private final JSSupport javascriptSupport;
private final Environment environment;
private final JSONObject validations = new JSONObject();
- public ClientBehaviorSupportImpl(JavascriptSupport javascriptSupport, Environment environment)
+ public ClientBehaviorSupportImpl(JSSupport javascriptSupport, Environment environment)
{
this.javascriptSupport = javascriptSupport;
this.environment = environment;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalModule.java?rev=980130&r1=980129&r2=980130&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalModule.java Wed Jul 28 17:33:14 2010
@@ -19,7 +19,7 @@ import javax.servlet.http.Cookie;
import org.apache.tapestry5.SymbolConstants;
import org.apache.tapestry5.internal.pageload.PageLoaderImpl;
import org.apache.tapestry5.internal.services.ajax.AjaxFormUpdateController;
-import org.apache.tapestry5.internal.services.javascript.JavascriptStackPathConstructor;
+import org.apache.tapestry5.internal.services.javascript.JSStackPathConstructor;
import org.apache.tapestry5.internal.structure.ComponentPageElementResourcesSource;
import org.apache.tapestry5.internal.structure.ComponentPageElementResourcesSourceImpl;
import org.apache.tapestry5.ioc.ObjectLocator;
@@ -90,7 +90,7 @@ public class InternalModule
binder.bind(ResponseCompressionAnalyzer.class, ResponseCompressionAnalyzerImpl.class);
binder.bind(ComponentModelSource.class);
binder.bind(AssetResourceLocator.class);
- binder.bind(JavascriptStackPathConstructor.class);
+ binder.bind(JSStackPathConstructor.class);
binder.bind(AjaxFormUpdateController.class);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RenderSupportImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RenderSupportImpl.java?rev=980130&r1=980129&r2=980130&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RenderSupportImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RenderSupportImpl.java Wed Jul 28 17:33:14 2010
@@ -23,7 +23,7 @@ import org.apache.tapestry5.ioc.services
import org.apache.tapestry5.json.JSONArray;
import org.apache.tapestry5.json.JSONObject;
import org.apache.tapestry5.services.AssetSource;
-import org.apache.tapestry5.services.javascript.JavascriptSupport;
+import org.apache.tapestry5.services.javascript.JSSupport;
import org.apache.tapestry5.services.javascript.StylesheetLink;
import org.apache.tapestry5.services.javascript.StylesheetOptions;
@@ -37,7 +37,7 @@ public class RenderSupportImpl implement
private String focusFieldId;
- private final JavascriptSupport javascriptSupport;
+ private final JSSupport javascriptSupport;
/**
* @param symbolSource
@@ -49,7 +49,7 @@ public class RenderSupportImpl implement
* @param ClientInfrastructure
* Identifies which JavaScript libraries and stylesheets are needed in a full page render
*/
- public RenderSupportImpl(SymbolSource symbolSource, AssetSource assetSource, JavascriptSupport javascriptSupport)
+ public RenderSupportImpl(SymbolSource symbolSource, AssetSource assetSource, JSSupport javascriptSupport)
{
this.symbolSource = symbolSource;
this.assetSource = assetSource;
@@ -79,7 +79,7 @@ public class RenderSupportImpl implement
public void addScriptLink(String... scriptURLs)
{
for (String url : scriptURLs)
- javascriptSupport.importJavascriptLibrary(url);
+ javascriptSupport.importJavaScriptLibrary(url);
}
public void addClasspathScriptLink(String... classpaths)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestConstants.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestConstants.java?rev=980130&r1=980129&r2=980130&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestConstants.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestConstants.java Wed Jul 28 17:33:14 2010
@@ -16,7 +16,7 @@ package org.apache.tapestry5.internal.se
import org.apache.tapestry5.corelib.components.Form;
import org.apache.tapestry5.corelib.components.FormInjector;
-import org.apache.tapestry5.services.javascript.JavascriptStack;
+import org.apache.tapestry5.services.javascript.JSStack;
/**
* Constants used when processing requests from the client web browser.
@@ -38,7 +38,7 @@ public final class RequestConstants
public static final String CONTEXT_FOLDER = "ctx";
/**
- * Folder for combined {@link JavascriptStack} JavaScript files. The path consists of the locale (as a folder) and
+ * Folder for combined {@link JSStack} JavaScript files. The path consists of the locale (as a folder) and
* the name
* of the stack (suffixed with ".js").
*
Copied: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ajax/JSSupportImpl.java (from r979956, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ajax/JavascriptSupportImpl.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ajax/JSSupportImpl.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ajax/JSSupportImpl.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ajax/JavascriptSupportImpl.java&r1=979956&r2=980130&rev=980130&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ajax/JavascriptSupportImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ajax/JSSupportImpl.java Wed Jul 28 17:33:14 2010
@@ -24,7 +24,7 @@ import org.apache.tapestry5.func.F;
import org.apache.tapestry5.func.Worker;
import org.apache.tapestry5.internal.InternalConstants;
import org.apache.tapestry5.internal.services.DocumentLinker;
-import org.apache.tapestry5.internal.services.javascript.JavascriptStackPathConstructor;
+import org.apache.tapestry5.internal.services.javascript.JSStackPathConstructor;
import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import org.apache.tapestry5.ioc.services.Coercion;
@@ -32,12 +32,12 @@ import org.apache.tapestry5.ioc.util.IdA
import org.apache.tapestry5.json.JSONArray;
import org.apache.tapestry5.json.JSONObject;
import org.apache.tapestry5.services.javascript.InitializationPriority;
-import org.apache.tapestry5.services.javascript.JavascriptStack;
-import org.apache.tapestry5.services.javascript.JavascriptStackSource;
-import org.apache.tapestry5.services.javascript.JavascriptSupport;
+import org.apache.tapestry5.services.javascript.JSStack;
+import org.apache.tapestry5.services.javascript.JSStackSource;
+import org.apache.tapestry5.services.javascript.JSSupport;
import org.apache.tapestry5.services.javascript.StylesheetLink;
-public class JavascriptSupportImpl implements JavascriptSupport
+public class JSSupportImpl implements JSSupport
{
private final IdAllocator idAllocator;
@@ -57,9 +57,9 @@ public class JavascriptSupportImpl imple
private final Map<InitializationPriority, JSONObject> inits = CollectionFactory.newMap();
- private final JavascriptStackSource javascriptStackSource;
+ private final JSStackSource javascriptStackSource;
- private final JavascriptStackPathConstructor stackPathConstructor;
+ private final JSStackPathConstructor stackPathConstructor;
private static final Coercion<Asset, String> toPath = new Coercion<Asset, String>()
{
@@ -69,14 +69,14 @@ public class JavascriptSupportImpl imple
}
};
- public JavascriptSupportImpl(DocumentLinker linker, JavascriptStackSource javascriptStackSource,
- JavascriptStackPathConstructor stackPathConstructor)
+ public JSSupportImpl(DocumentLinker linker, JSStackSource javascriptStackSource,
+ JSStackPathConstructor stackPathConstructor)
{
this(linker, javascriptStackSource, stackPathConstructor, new IdAllocator(), false);
}
- public JavascriptSupportImpl(DocumentLinker linker, JavascriptStackSource javascriptStackSource,
- JavascriptStackPathConstructor stackPathConstructor, IdAllocator idAllocator, boolean partialMode)
+ public JSSupportImpl(DocumentLinker linker, JSStackSource javascriptStackSource,
+ JSStackPathConstructor stackPathConstructor, IdAllocator idAllocator, boolean partialMode)
{
this.linker = linker;
this.idAllocator = idAllocator;
@@ -195,10 +195,10 @@ public class JavascriptSupportImpl imple
public void importJavascriptLibrary(Asset asset)
{
assert asset != null;
- importJavascriptLibrary(asset.toClientURL());
+ importJavaScriptLibrary(asset.toClientURL());
}
- public void importJavascriptLibrary(String libraryURL)
+ public void importJavaScriptLibrary(String libraryURL)
{
addCoreStackIfNeeded();
@@ -218,9 +218,9 @@ public class JavascriptSupportImpl imple
if (addedStacks.containsKey(stackName))
return;
- JavascriptStack stack = javascriptStackSource.getStack(stackName);
+ JSStack stack = javascriptStackSource.getStack(stackName);
- stackLibraries.addAll(stackPathConstructor.constructPathsForJavascriptStack(stackName));
+ stackLibraries.addAll(stackPathConstructor.constructPathsForJavaScriptStack(stackName));
stylesheetLinks.addAll(stack.getStylesheets());
Propchange: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ajax/JSSupportImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/StackAssetRequestHandler.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/StackAssetRequestHandler.java?rev=980130&r1=980129&r2=980130&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/StackAssetRequestHandler.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/StackAssetRequestHandler.java Wed Jul 28 17:33:14 2010
@@ -42,14 +42,14 @@ import org.apache.tapestry5.services.Req
import org.apache.tapestry5.services.Response;
import org.apache.tapestry5.services.ResponseCompressionAnalyzer;
import org.apache.tapestry5.services.assets.AssetRequestHandler;
-import org.apache.tapestry5.services.javascript.JavascriptStack;
-import org.apache.tapestry5.services.javascript.JavascriptStackSource;
+import org.apache.tapestry5.services.javascript.JSStack;
+import org.apache.tapestry5.services.javascript.JSStackSource;
public class StackAssetRequestHandler implements AssetRequestHandler, InvalidationListener
{
private final ResourceCache resourceCache;
- private final JavascriptStackSource javascriptStackSource;
+ private final JSStackSource javascriptStackSource;
private final LocalizationSetter localizationSetter;
@@ -64,7 +64,7 @@ public class StackAssetRequestHandler im
private final Map<String, BytestreamCache> compressedCache = CollectionFactory.newCaseInsensitiveMap();
- public StackAssetRequestHandler(ResourceCache resourceCache, JavascriptStackSource javascriptStackSource,
+ public StackAssetRequestHandler(ResourceCache resourceCache, JSStackSource javascriptStackSource,
LocalizationSetter localizationSetter, ResponseCompressionAnalyzer compressionAnalyzer,
@Symbol(SymbolConstants.PRODUCTION_MODE)
@@ -168,7 +168,7 @@ public class StackAssetRequestHandler im
{
localizationSetter.setNonPeristentLocaleFromLocaleName(localeName);
- JavascriptStack stack = javascriptStackSource.getStack(stackName);
+ JSStack stack = javascriptStackSource.getStack(stackName);
List<Asset> libraries = stack.getJavascriptLibraries();
return assembleStackContent(libraries);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/CoreJavascriptStack.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/CoreJavascriptStack.java?rev=980130&r1=980129&r2=980130&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/CoreJavascriptStack.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/CoreJavascriptStack.java Wed Jul 28 17:33:14 2010
@@ -22,7 +22,7 @@ import org.apache.tapestry5.func.F;
import org.apache.tapestry5.internal.TapestryInternalUtils;
import org.apache.tapestry5.ioc.annotations.Symbol;
import org.apache.tapestry5.services.ClientInfrastructure;
-import org.apache.tapestry5.services.javascript.JavascriptStack;
+import org.apache.tapestry5.services.javascript.JSStack;
import org.apache.tapestry5.services.javascript.StylesheetLink;
/**
@@ -30,7 +30,7 @@ import org.apache.tapestry5.services.jav
*
* @since 5.2.0
*/
-public class CoreJavascriptStack implements JavascriptStack
+public class CoreJavascriptStack implements JSStack
{
private final ClientInfrastructure clientInfrastructure;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/DateFieldStack.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/DateFieldStack.java?rev=980130&r1=980129&r2=980130&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/DateFieldStack.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/DateFieldStack.java Wed Jul 28 17:33:14 2010
@@ -29,10 +29,10 @@ import org.apache.tapestry5.ioc.services
import org.apache.tapestry5.json.JSONArray;
import org.apache.tapestry5.json.JSONObject;
import org.apache.tapestry5.services.AssetSource;
-import org.apache.tapestry5.services.javascript.JavascriptStack;
+import org.apache.tapestry5.services.javascript.JSStack;
import org.apache.tapestry5.services.javascript.StylesheetLink;
-public class DateFieldStack implements JavascriptStack
+public class DateFieldStack implements JSStack
{
private final ThreadLocale threadLocale;
Copied: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JSStackPathConstructor.java (from r979956, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JavascriptStackPathConstructor.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JSStackPathConstructor.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JSStackPathConstructor.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JavascriptStackPathConstructor.java&r1=979956&r2=980130&rev=980130&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JavascriptStackPathConstructor.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JSStackPathConstructor.java Wed Jul 28 17:33:14 2010
@@ -17,9 +17,9 @@ package org.apache.tapestry5.internal.se
import java.util.List;
import org.apache.tapestry5.SymbolConstants;
-import org.apache.tapestry5.services.javascript.JavascriptStack;
-import org.apache.tapestry5.services.javascript.JavascriptStackSource;
-import org.apache.tapestry5.services.javascript.JavascriptSupport;
+import org.apache.tapestry5.services.javascript.JSStack;
+import org.apache.tapestry5.services.javascript.JSStackSource;
+import org.apache.tapestry5.services.javascript.JSSupport;
/**
* Used to generate a list of asset URL paths for the JavaScript libraries
@@ -27,18 +27,18 @@ import org.apache.tapestry5.services.jav
* aggregation}.
*
* @since 5.2.0
- * @see JavascriptStack
- * @see JavascriptStackSource
- * @see JavascriptSupport
+ * @see JSStack
+ * @see JSStackSource
+ * @see JSSupport
*/
-public interface JavascriptStackPathConstructor
+public interface JSStackPathConstructor
{
/**
* Given a stack, by name, return a list of URL paths for the individual libraqries in the stack.
* If scripts are combined, this will be a single (combined) URL.
*
* @param stackName
- * name of {@link JavascriptStack}
+ * name of {@link JSStack}
*/
- List<String> constructPathsForJavascriptStack(String stackName);
+ List<String> constructPathsForJavaScriptStack(String stackName);
}
Propchange: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JSStackPathConstructor.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JSStackPathConstructorImpl.java (from r979956, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JavascriptStackPathConstructorImpl.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JSStackPathConstructorImpl.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JSStackPathConstructorImpl.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JavascriptStackPathConstructorImpl.java&r1=979956&r2=980130&rev=980130&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JavascriptStackPathConstructorImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JSStackPathConstructorImpl.java Wed Jul 28 17:33:14 2010
@@ -25,16 +25,16 @@ import org.apache.tapestry5.ioc.annotati
import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
import org.apache.tapestry5.ioc.services.ThreadLocale;
import org.apache.tapestry5.services.assets.AssetPathConstructor;
-import org.apache.tapestry5.services.javascript.JavascriptStack;
-import org.apache.tapestry5.services.javascript.JavascriptStackSource;
+import org.apache.tapestry5.services.javascript.JSStack;
+import org.apache.tapestry5.services.javascript.JSStackSource;
-public class JavascriptStackPathConstructorImpl implements JavascriptStackPathConstructor
+public class JSStackPathConstructorImpl implements JSStackPathConstructor
{
private final ThreadLocale threadLocale;
private final AssetPathConstructor assetPathConstructor;
- private final JavascriptStackSource javascriptStackSource;
+ private final JSStackSource javascriptStackSource;
private final boolean combineScripts;
@@ -46,8 +46,8 @@ public class JavascriptStackPathConstruc
}
};
- public JavascriptStackPathConstructorImpl(ThreadLocale threadLocale, AssetPathConstructor assetPathConstructor,
- JavascriptStackSource javascriptStackSource,
+ public JSStackPathConstructorImpl(ThreadLocale threadLocale, AssetPathConstructor assetPathConstructor,
+ JSStackSource javascriptStackSource,
@Symbol(SymbolConstants.COMBINE_SCRIPTS)
boolean combineScripts)
@@ -58,9 +58,9 @@ public class JavascriptStackPathConstruc
this.combineScripts = combineScripts;
}
- public List<String> constructPathsForJavascriptStack(String stackName)
+ public List<String> constructPathsForJavaScriptStack(String stackName)
{
- JavascriptStack stack = javascriptStackSource.getStack(stackName);
+ JSStack stack = javascriptStackSource.getStack(stackName);
List<Asset> assets = stack.getJavascriptLibraries();
Propchange: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JSStackPathConstructorImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JSStackSourceImpl.java (from r979956, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JavascriptStackSourceImpl.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JSStackSourceImpl.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JSStackSourceImpl.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JavascriptStackSourceImpl.java&r1=979956&r2=980130&rev=980130&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JavascriptStackSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JSStackSourceImpl.java Wed Jul 28 17:33:14 2010
@@ -18,21 +18,21 @@ import java.util.Map;
import org.apache.tapestry5.ioc.util.AvailableValues;
import org.apache.tapestry5.ioc.util.UnknownValueException;
-import org.apache.tapestry5.services.javascript.JavascriptStack;
-import org.apache.tapestry5.services.javascript.JavascriptStackSource;
+import org.apache.tapestry5.services.javascript.JSStack;
+import org.apache.tapestry5.services.javascript.JSStackSource;
-public class JavascriptStackSourceImpl implements JavascriptStackSource
+public class JSStackSourceImpl implements JSStackSource
{
- private final Map<String, JavascriptStack> configuration;
+ private final Map<String, JSStack> configuration;
- public JavascriptStackSourceImpl(Map<String, JavascriptStack> configuration)
+ public JSStackSourceImpl(Map<String, JSStack> configuration)
{
this.configuration = configuration;
}
- public JavascriptStack getStack(String name)
+ public JSStack getStack(String name)
{
- JavascriptStack stack = configuration.get(name);
+ JSStack stack = configuration.get(name);
if (stack == null)
throw new UnknownValueException(String.format("No JavascriptStack with name '%s'.", name),
Propchange: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JSStackSourceImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/AbstractIncludeAssetWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/AbstractIncludeAssetWorker.java?rev=980130&r1=980129&r2=980130&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/AbstractIncludeAssetWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/AbstractIncludeAssetWorker.java Wed Jul 28 17:33:14 2010
@@ -33,7 +33,7 @@ import org.apache.tapestry5.services.Com
import org.apache.tapestry5.services.FieldAccess;
import org.apache.tapestry5.services.TransformConstants;
import org.apache.tapestry5.services.TransformField;
-import org.apache.tapestry5.services.javascript.JavascriptSupport;
+import org.apache.tapestry5.services.javascript.JSSupport;
/**
* Base class for workers that automatically include assets in the page (via methods on
@@ -169,7 +169,7 @@ public abstract class AbstractIncludeAss
* Invoked, from the component's setup render phase, for each asset. This method must be
* threadsafe. Most
* implementations pass the asset to a particular method of {@link org.apache.tapestry5.RenderSupport} or
- * {@link JavascriptSupport}.
+ * {@link JSSupport}.
*
* @param asset
* to be processed
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ImportWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ImportWorker.java?rev=980130&r1=980129&r2=980130&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ImportWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ImportWorker.java Wed Jul 28 17:33:14 2010
@@ -30,7 +30,7 @@ import org.apache.tapestry5.ioc.services
import org.apache.tapestry5.model.MutableComponentModel;
import org.apache.tapestry5.runtime.Component;
import org.apache.tapestry5.services.*;
-import org.apache.tapestry5.services.javascript.JavascriptSupport;
+import org.apache.tapestry5.services.javascript.JSSupport;
/**
* Implements the {@link Import} annotation, both at the class and at the method level.
@@ -39,7 +39,7 @@ import org.apache.tapestry5.services.jav
*/
public class ImportWorker implements ComponentClassTransformWorker
{
- private final JavascriptSupport javascriptSupport;
+ private final JSSupport javascriptSupport;
private final SymbolSource symbolSource;
@@ -61,7 +61,7 @@ public class ImportWorker implements Com
};
};
- public ImportWorker(JavascriptSupport javascriptSupport, SymbolSource symbolSource, AssetSource assetSource)
+ public ImportWorker(JSSupport javascriptSupport, SymbolSource symbolSource, AssetSource assetSource)
{
this.javascriptSupport = javascriptSupport;
this.symbolSource = symbolSource;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/IncludeJavaScriptLibraryWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/IncludeJavaScriptLibraryWorker.java?rev=980130&r1=980129&r2=980130&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/IncludeJavaScriptLibraryWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/IncludeJavaScriptLibraryWorker.java Wed Jul 28 17:33:14 2010
@@ -20,17 +20,17 @@ import org.apache.tapestry5.ioc.services
import org.apache.tapestry5.model.MutableComponentModel;
import org.apache.tapestry5.services.AssetSource;
import org.apache.tapestry5.services.ClassTransformation;
-import org.apache.tapestry5.services.javascript.JavascriptSupport;
+import org.apache.tapestry5.services.javascript.JSSupport;
/**
* Recognizes the {@link org.apache.tapestry5.annotations.IncludeJavaScriptLibrary} annotation, and ensures that
- * {@link JavascriptSupport#importJavascriptLibrary(Asset)} is invoked.
+ * {@link JSSupport#importJavascriptLibrary(Asset)} is invoked.
*/
public class IncludeJavaScriptLibraryWorker extends AbstractIncludeAssetWorker
{
- private final JavascriptSupport javascriptSupport;
+ private final JSSupport javascriptSupport;
- public IncludeJavaScriptLibraryWorker(AssetSource assetSource, JavascriptSupport renderSupport,
+ public IncludeJavaScriptLibraryWorker(AssetSource assetSource, JSSupport renderSupport,
SymbolSource symbolSource)
{
super(assetSource, symbolSource);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/translator/NumericTranslatorSupportImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/translator/NumericTranslatorSupportImpl.java?rev=980130&r1=980129&r2=980130&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/translator/NumericTranslatorSupportImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/translator/NumericTranslatorSupportImpl.java Wed Jul 28 17:33:14 2010
@@ -34,7 +34,7 @@ import org.apache.tapestry5.json.JSONObj
import org.apache.tapestry5.services.ClientBehaviorSupport;
import org.apache.tapestry5.services.Request;
import org.apache.tapestry5.services.javascript.InitializationPriority;
-import org.apache.tapestry5.services.javascript.JavascriptSupport;
+import org.apache.tapestry5.services.javascript.JSSupport;
public class NumericTranslatorSupportImpl implements NumericTranslatorSupport
{
@@ -44,7 +44,7 @@ public class NumericTranslatorSupportImp
private final Request request;
- private final JavascriptSupport javascriptSupport;
+ private final JSSupport javascriptSupport;
private final ClientBehaviorSupport clientBehaviorSupport;
@@ -57,7 +57,7 @@ public class NumericTranslatorSupportImp
private static final String DECIMAL_FORMAT_SYMBOLS_PROVIDED = "tapestry.decimal-format-symbols-provided";
public NumericTranslatorSupportImpl(TypeCoercer typeCoercer, ThreadLocale threadLocale, Request request,
- JavascriptSupport javascriptSupport, ClientBehaviorSupport clientBehaviorSupport,
+ JSSupport javascriptSupport, ClientBehaviorSupport clientBehaviorSupport,
@Symbol(SymbolConstants.COMPACT_JSON)
boolean compactJSON)
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ClientInfrastructure.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ClientInfrastructure.java?rev=980130&r1=980129&r2=980130&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ClientInfrastructure.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ClientInfrastructure.java Wed Jul 28 17:33:14 2010
@@ -15,7 +15,7 @@
package org.apache.tapestry5.services;
import org.apache.tapestry5.Asset;
-import org.apache.tapestry5.services.javascript.JavascriptStack;
+import org.apache.tapestry5.services.javascript.JSStack;
import java.util.List;
@@ -35,7 +35,7 @@ import java.util.List;
* Tapestry's default client-side resources.
* <p>
*
- * @deprecated ClientInfrastructure now exists to define the "core" {@link JavascriptStack}. It may be removed
+ * @deprecated ClientInfrastructure now exists to define the "core" {@link JSStack}. It may be removed
* in the future.
* @since 5.1.0.2
*/
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java?rev=980130&r1=980129&r2=980130&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java Wed Jul 28 17:33:14 2010
@@ -71,15 +71,15 @@ import org.apache.tapestry5.internal.ren
import org.apache.tapestry5.internal.renderers.RequestRenderer;
import org.apache.tapestry5.internal.services.*;
import org.apache.tapestry5.internal.services.ajax.AjaxFormUpdateFilter;
-import org.apache.tapestry5.internal.services.ajax.JavascriptSupportImpl;
+import org.apache.tapestry5.internal.services.ajax.JSSupportImpl;
import org.apache.tapestry5.internal.services.assets.AssetPathConstructorImpl;
import org.apache.tapestry5.internal.services.assets.ClasspathAssetRequestHandler;
import org.apache.tapestry5.internal.services.assets.ContextAssetRequestHandler;
import org.apache.tapestry5.internal.services.assets.StackAssetRequestHandler;
import org.apache.tapestry5.internal.services.javascript.CoreJavascriptStack;
import org.apache.tapestry5.internal.services.javascript.DateFieldStack;
-import org.apache.tapestry5.internal.services.javascript.JavascriptStackPathConstructor;
-import org.apache.tapestry5.internal.services.javascript.JavascriptStackSourceImpl;
+import org.apache.tapestry5.internal.services.javascript.JSStackPathConstructor;
+import org.apache.tapestry5.internal.services.javascript.JSStackSourceImpl;
import org.apache.tapestry5.internal.services.linktransform.LinkTransformerImpl;
import org.apache.tapestry5.internal.services.linktransform.LinkTransformerInterceptor;
import org.apache.tapestry5.internal.services.messages.PropertiesFileParserImpl;
@@ -113,9 +113,9 @@ import org.apache.tapestry5.runtime.Rend
import org.apache.tapestry5.services.ajax.MultiZoneUpdateEventResultProcessor;
import org.apache.tapestry5.services.assets.AssetPathConstructor;
import org.apache.tapestry5.services.assets.AssetRequestHandler;
-import org.apache.tapestry5.services.javascript.JavascriptStack;
-import org.apache.tapestry5.services.javascript.JavascriptStackSource;
-import org.apache.tapestry5.services.javascript.JavascriptSupport;
+import org.apache.tapestry5.services.javascript.JSStack;
+import org.apache.tapestry5.services.javascript.JSStackSource;
+import org.apache.tapestry5.services.javascript.JSSupport;
import org.apache.tapestry5.services.javascript.StylesheetLink;
import org.apache.tapestry5.services.linktransform.ComponentEventLinkTransformer;
import org.apache.tapestry5.services.linktransform.LinkTransformer;
@@ -383,7 +383,7 @@ public final class TapestryModule
binder.bind(PageActivator.class, PageActivatorImpl.class);
binder.bind(Dispatcher.class, AssetDispatcher.class).withId("AssetDispatcher");
binder.bind(AssetPathConstructor.class, AssetPathConstructorImpl.class);
- binder.bind(JavascriptStackSource.class, JavascriptStackSourceImpl.class);
+ binder.bind(JSStackSource.class, JSStackSourceImpl.class);
binder.bind(TranslatorAlternatesSource.class, TranslatorAlternatesSourceImpl.class);
binder.bind(MetaWorker.class, MetaWorkerImpl.class);
binder.bind(LinkTransformer.class, LinkTransformerImpl.class);
@@ -490,7 +490,7 @@ public final class TapestryModule
/**
* Contributes an handler for each mapped classpath alias, as well handlers for context assets
- * and stack assets (combined {@link JavascriptStack} files).
+ * and stack assets (combined {@link JSStack} files).
*/
public static void contributeAssetDispatcher(MappedConfiguration<String, AssetRequestHandler> configuration,
@@ -1368,13 +1368,13 @@ public final class TapestryModule
}
/**
- * Builds a proxy to the current {@link JavascriptSupport} inside this thread's {@link Environment}.
+ * Builds a proxy to the current {@link JSSupport} inside this thread's {@link Environment}.
*
* @since 5.2.0
*/
- public JavascriptSupport buildJavascriptSupport()
+ public JSSupport buildJavascriptSupport()
{
- return environmentalBuilder.build(JavascriptSupport.class);
+ return environmentalBuilder.build(JSSupport.class);
}
/**
@@ -1920,7 +1920,7 @@ public final class TapestryModule
* <dt>DocumentLinker</dt>
* <dd>Provides {@link org.apache.tapestry5.internal.services.DocumentLinker}</dd>
* <dt>JavascriptSupport</dt>
- * <dd>Provides {@link JavascriptSupport}</dd>
+ * <dd>Provides {@link JSSupport}</dd>
* <dt>RenderSupport</dt>
* <dd>Provides {@link org.apache.tapestry5.RenderSupport}</dd>
* <dt>InjectDefaultStyleheet</dt>
@@ -1952,9 +1952,9 @@ public final class TapestryModule
final AssetSource assetSource,
- final JavascriptStackSource javascriptStackSource,
+ final JSStackSource javascriptStackSource,
- final JavascriptStackPathConstructor javascriptStackPathConstructor,
+ final JSStackPathConstructor javascriptStackPathConstructor,
@Path("${tapestry.default-stylesheet}")
final Asset defaultStylesheet)
@@ -1981,14 +1981,14 @@ public final class TapestryModule
{
DocumentLinker linker = environment.peekRequired(DocumentLinker.class);
- JavascriptSupportImpl support = new JavascriptSupportImpl(linker, javascriptStackSource,
+ JSSupportImpl support = new JSSupportImpl(linker, javascriptStackSource,
javascriptStackPathConstructor);
- environment.push(JavascriptSupport.class, support);
+ environment.push(JSSupport.class, support);
renderer.renderMarkup(writer);
- environment.pop(JavascriptSupport.class);
+ environment.pop(JSSupport.class);
support.commit();
}
@@ -1998,7 +1998,7 @@ public final class TapestryModule
{
public void renderMarkup(MarkupWriter writer, MarkupRenderer renderer)
{
- JavascriptSupport javascriptSupport = environment.peekRequired(JavascriptSupport.class);
+ JSSupport javascriptSupport = environment.peekRequired(JSSupport.class);
RenderSupportImpl support = new RenderSupportImpl(symbolSource, assetSource, javascriptSupport);
@@ -2028,7 +2028,7 @@ public final class TapestryModule
{
public void renderMarkup(MarkupWriter writer, MarkupRenderer renderer)
{
- JavascriptSupport javascriptSupport = environment.peekRequired(JavascriptSupport.class);
+ JSSupport javascriptSupport = environment.peekRequired(JSSupport.class);
ClientBehaviorSupportImpl clientBehaviorSupport = new ClientBehaviorSupportImpl(javascriptSupport,
environment);
@@ -2091,7 +2091,7 @@ public final class TapestryModule
* <dt>DocumentLinker
* <dd>Provides {@link org.apache.tapestry5.internal.services.DocumentLinker}
* <dt>JavascriptSupport
- * <dd>Provides {@link JavascriptSupport}</dd>
+ * <dd>Provides {@link JSSupport}</dd>
* <dt>PageRenderSupport</dt>
* <dd>Provides {@link org.apache.tapestry5.RenderSupport}</dd>
* <dt>ClientBehaviorSupport</dt>
@@ -2108,9 +2108,9 @@ public final class TapestryModule
@Path("${tapestry.spacer-image}")
final Asset spacerImage,
- final JavascriptStackSource javascriptStackSource,
+ final JSStackSource javascriptStackSource,
- final JavascriptStackPathConstructor javascriptStackPathConstructor,
+ final JSStackPathConstructor javascriptStackPathConstructor,
final SymbolSource symbolSource,
@@ -2144,14 +2144,14 @@ public final class TapestryModule
DocumentLinker linker = environment.peekRequired(DocumentLinker.class);
- JavascriptSupportImpl support = new JavascriptSupportImpl(linker, javascriptStackSource,
+ JSSupportImpl support = new JSSupportImpl(linker, javascriptStackSource,
javascriptStackPathConstructor, idAllocator, true);
- environment.push(JavascriptSupport.class, support);
+ environment.push(JSSupport.class, support);
renderer.renderMarkup(writer, reply);
- environment.pop(JavascriptSupport.class);
+ environment.pop(JSSupport.class);
support.commit();
}
@@ -2161,7 +2161,7 @@ public final class TapestryModule
{
public void renderMarkup(MarkupWriter writer, JSONObject reply, PartialMarkupRenderer renderer)
{
- JavascriptSupport javascriptSupport = environment.peekRequired(JavascriptSupport.class);
+ JSSupport javascriptSupport = environment.peekRequired(JSSupport.class);
RenderSupportImpl support = new RenderSupportImpl(symbolSource, assetSource, javascriptSupport);
@@ -2179,7 +2179,7 @@ public final class TapestryModule
{
public void renderMarkup(MarkupWriter writer, JSONObject reply, PartialMarkupRenderer renderer)
{
- JavascriptSupport javascriptSupport = environment.peekRequired(JavascriptSupport.class);
+ JSSupport javascriptSupport = environment.peekRequired(JSSupport.class);
ClientBehaviorSupportImpl support = new ClientBehaviorSupportImpl(javascriptSupport, environment);
@@ -2880,11 +2880,11 @@ public final class TapestryModule
}
/**
- * Contributes the "core" and "core-datefield" {@link JavascriptStack}s
+ * Contributes the "core" and "core-datefield" {@link JSStack}s
*
* @since 5.2.0
*/
- public static void contributeJavascriptStackSource(MappedConfiguration<String, JavascriptStack> configuration)
+ public static void contributeJavascriptStackSource(MappedConfiguration<String, JSStack> configuration)
{
configuration.addInstance(InternalConstants.CORE_STACK_NAME, CoreJavascriptStack.class);
configuration.addInstance("core-datefield", DateFieldStack.class);
Copied: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JSStack.java (from r979956, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavascriptStack.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JSStack.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JSStack.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavascriptStack.java&r1=979956&r2=980130&rev=980130&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavascriptStack.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JSStack.java Wed Jul 28 17:33:14 2010
@@ -39,12 +39,12 @@ import org.apache.tapestry5.services.Cli
* Implementations may need to inject the {@link ThreadLocale} service in order to determine the current locale (if any
* of the assets are localized). They will generally need to inject they {@link AssetSource} service as well.
* <p>
- * A planned extension to this interface is to allow for dependencies between JavascriptStacks.
+ * A planned extension to this interface is to allow for dependencies between JavaScriptStacks.
*
* @since 5.2.0
* @see ThreadLocale
*/
-public interface JavascriptStack
+public interface JSStack
{
/**
* Returns a list of <em>localized</em> assets for JavaScript libraries that form the stack.
Propchange: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JSStack.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JSStackSource.java (from r979956, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavascriptStackSource.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JSStackSource.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JSStackSource.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavascriptStackSource.java&r1=979956&r2=980130&rev=980130&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavascriptStackSource.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JSStackSource.java Wed Jul 28 17:33:14 2010
@@ -18,12 +18,12 @@ import org.apache.tapestry5.ioc.annotati
import org.apache.tapestry5.ioc.util.UnknownValueException;
/**
- * Manages the available {@link JavascriptStack}s, each of which has a unique name.
+ * Manages the available {@link JSStack}s, each of which has a unique name.
*
* @since 5.2.0
*/
-@UsesMappedConfiguration(JavascriptStack.class)
-public interface JavascriptStackSource
+@UsesMappedConfiguration(JSStack.class)
+public interface JSStackSource
{
/**
* Gets a stack by name (ignoring case).
@@ -32,5 +32,5 @@ public interface JavascriptStackSource
* @throws UnknownValueException
* if no such stack
*/
- JavascriptStack getStack(String name);
+ JSStack getStack(String name);
}
Propchange: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JSStackSource.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JSSupport.java (from r979956, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavascriptSupport.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JSSupport.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JSSupport.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavascriptSupport.java&r1=979956&r2=980130&rev=980130&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavascriptSupport.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JSSupport.java Wed Jul 28 17:33:14 2010
@@ -43,7 +43,7 @@ import org.apache.tapestry5.services.Env
*
* @since 5.2.0
*/
-public interface JavascriptSupport
+public interface JSSupport
{
/**
* Allocates a unique id based on the component's id. In some cases, the return value will not precisely match the
@@ -166,8 +166,8 @@ public interface JavascriptSupport
void importStylesheet(StylesheetLink stylesheetLink);
/**
- * Imports a {@link JavascriptStack} by name, a related set of JavaScript libraries and stylesheets.
- * Stacks are contributions to the {@link JavascriptStackSource} service. When
+ * Imports a {@link JSStack} by name, a related set of JavaScript libraries and stylesheets.
+ * Stacks are contributions to the {@link JSStackSource} service. When
* {@linkplain SymbolConstants#COMBINE_SCRIPTS Javascript aggregation} in enabled, the stack will be represented by
* a single virtual URL; otherwise the individual asset URLs of the stack
* will be added to the document.
@@ -180,5 +180,5 @@ public interface JavascriptSupport
/**
* Import a Javascript library with an arbitrary URL.
*/
- void importJavascriptLibrary(String libraryURL);
+ void importJavaScriptLibrary(String libraryURL);
}
Propchange: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JSSupport.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StylesheetLink.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StylesheetLink.java?rev=980130&r1=980129&r2=980130&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StylesheetLink.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StylesheetLink.java Wed Jul 28 17:33:14 2010
@@ -26,7 +26,7 @@ import org.apache.tapestry5.ioc.internal
* as part of a JSON partial page render response.
*
* @see DocumentLinker
- * @see JavascriptStack
+ * @see JSStack
* @since 5.2.0
*/
public final class StylesheetLink
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/test/TapestryTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/test/TapestryTestCase.java?rev=980130&r1=980129&r2=980130&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/test/TapestryTestCase.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/test/TapestryTestCase.java Wed Jul 28 17:33:14 2010
@@ -83,7 +83,7 @@ import org.apache.tapestry5.model.Mutabl
import org.apache.tapestry5.model.ParameterModel;
import org.apache.tapestry5.runtime.Component;
import org.apache.tapestry5.services.*;
-import org.apache.tapestry5.services.javascript.JavascriptSupport;
+import org.apache.tapestry5.services.javascript.JSSupport;
import org.easymock.EasyMock;
import org.easymock.IAnswer;
@@ -1244,9 +1244,9 @@ public abstract class TapestryTestCase e
return newMock(ClientInfrastructure.class);
}
- protected final JavascriptSupport mockJavascriptSupport()
+ protected final JSSupport mockJavascriptSupport()
{
- return newMock(JavascriptSupport.class);
+ return newMock(JSSupport.class);
}
protected final Asset mockAsset(String assetURL)