Author: jdonnerstag
Date: Sat Dec 11 12:48:38 2010
New Revision: 1044645
URL: http://svn.apache.org/viewvc?rev=1044645&view=rev
Log:
rename classes and methods from *JavaScript* to *Javascript*
Issue: WICKET-715
Added:
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/JavaScriptResourceReference.java
- copied, changed from r1044640,
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/JavascriptResourceReference.java
Removed:
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/JavascriptResourceReference.java
Modified:
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/WicketAjaxReference.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WicketEventReference.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/PanelWithHeaderPart.java
Modified:
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java?rev=1044645&r1=1044644&r2=1044645&view=diff
==============================================================================
---
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
(original)
+++
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
Sat Dec 11 12:48:38 2010
@@ -42,7 +42,7 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.request.Response;
import org.apache.wicket.request.cycle.RequestCycle;
import
org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;
-import org.apache.wicket.request.resource.JavascriptResourceReference;
+import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.convert.IConverter;
@@ -123,9 +123,9 @@ public class DatePicker extends Behavior
// See wicket-2525: SimpleDateFormat consumes a lot of memory
public static String FORMAT_PAGEDATE = "MM/yyyy";
- private static final ResourceReference YUI = new
JavascriptResourceReference(YuiLib.class, "");
+ private static final ResourceReference YUI = new
JavaScriptResourceReference(YuiLib.class, "");
- private static final ResourceReference WICKET_DATE = new
JavascriptResourceReference(
+ private static final ResourceReference WICKET_DATE = new
JavaScriptResourceReference(
DatePicker.class, "wicket-date.js");
private static final long serialVersionUID = 1L;
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java?rev=1044645&r1=1044644&r2=1044645&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java
Sat Dec 11 12:48:38 2010
@@ -22,7 +22,7 @@ import org.apache.wicket.ajax.AbstractDe
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.resource.JavascriptResourceReference;
+import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.string.Strings;
@@ -33,7 +33,7 @@ import org.apache.wicket.util.string.Str
*/
public abstract class AbstractAutoCompleteBehavior extends
AbstractDefaultAjaxBehavior
{
- private static final ResourceReference AUTOCOMPLETE_JS = new
JavascriptResourceReference(
+ private static final ResourceReference AUTOCOMPLETE_JS = new
JavaScriptResourceReference(
AutoCompleteBehavior.class, "wicket-autocomplete.js");
private static final long serialVersionUID = 1L;
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java?rev=1044645&r1=1044644&r2=1044645&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
Sat Dec 11 12:48:38 2010
@@ -36,7 +36,7 @@ import org.apache.wicket.request.cycle.R
import org.apache.wicket.request.handler.PageProvider;
import org.apache.wicket.request.handler.RenderPageRequestHandler;
import org.apache.wicket.request.resource.CompressedResourceReference;
-import org.apache.wicket.request.resource.JavascriptResourceReference;
+import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.settings.IPageSettings;
import org.apache.wicket.util.lang.EnumeratedType;
@@ -126,7 +126,7 @@ public class ModalWindow extends Panel
/** CSS class for window with gray border. */
public final static String CSS_CLASS_GRAY = "w_silver";
- private static ResourceReference JAVASCRIPT = new
JavascriptResourceReference(
+ private static ResourceReference JAVASCRIPT = new
JavaScriptResourceReference(
ModalWindow.class, "res/modal.js");
private static ResourceReference CSS = new
CompressedResourceReference(ModalWindow.class,
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java?rev=1044645&r1=1044644&r2=1044645&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
Sat Dec 11 12:48:38 2010
@@ -36,7 +36,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.request.resource.CompressedResourceReference;
-import org.apache.wicket.request.resource.JavascriptResourceReference;
+import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
@@ -112,7 +112,7 @@ public class Palette<T> extends Panel
private Component selectionComponent;
/** reference to the palette's javascript resource */
- private static final ResourceReference JAVASCRIPT = new
JavascriptResourceReference(
+ private static final ResourceReference JAVASCRIPT = new
JavaScriptResourceReference(
Palette.class, "palette.js");
/** reference to the palette's css resource */
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java?rev=1044645&r1=1044644&r2=1044645&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
Sat Dec 11 12:48:38 2010
@@ -24,7 +24,7 @@ import org.apache.wicket.markup.html.IHe
import org.apache.wicket.markup.html.WicketEventReference;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.resource.JavascriptResourceReference;
+import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.settings.IDebugSettings;
@@ -49,7 +49,7 @@ public abstract class AbstractDefaultAja
AbstractDefaultAjaxBehavior.class, "indicator.gif");
/** reference to the default ajax debug support javascript file. */
- private static final ResourceReference JAVASCRIPT_DEBUG = new
JavascriptResourceReference(
+ private static final ResourceReference JAVASCRIPT_DEBUG = new
JavaScriptResourceReference(
AbstractDefaultAjaxBehavior.class, "wicket-ajax-debug.js");
/**
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java?rev=1044645&r1=1044644&r2=1044645&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java
Sat Dec 11 12:48:38 2010
@@ -110,7 +110,7 @@ public class AjaxRequestTarget implement
/**
* Triggered after ajax request target is done with its
response cycle. At this point only
* additional javascript can be output to the response using
the provided
- * {...@link IJavascriptResponse} object
+ * {...@link IJavaScriptResponse} object
*
* NOTE: During this stage of processing any calls to target
that manipulate the response
* (adding components, javascript) will have no effect
@@ -120,7 +120,7 @@ public class AjaxRequestTarget implement
* @param response
* response object that can be used to output
javascript
*/
- public void onAfterRespond(Map<String, Component> map,
IJavascriptResponse response);
+ public void onAfterRespond(Map<String, Component> map,
IJavaScriptResponse response);
}
/**
@@ -129,7 +129,7 @@ public class AjaxRequestTarget implement
*
* @author ivaynberg
*/
- public static interface IJavascriptResponse
+ public static interface IJavaScriptResponse
{
/**
* Adds more javascript to the ajax response that will be
executed on the client side
@@ -137,7 +137,7 @@ public class AjaxRequestTarget implement
* @param script
* javascript
*/
- public void addJavascript(String script);
+ public void addJavaScript(String script);
}
/**
@@ -674,9 +674,9 @@ public class AjaxRequestTarget implement
// create response that will be used by listeners to
append
// javascript
- final IJavascriptResponse jsresponse = new
IJavascriptResponse()
+ final IJavaScriptResponse jsresponse = new
IJavaScriptResponse()
{
- public void addJavascript(String script)
+ public void addJavaScript(String script)
{
respondInvocation(response, script);
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/WicketAjaxReference.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/WicketAjaxReference.java?rev=1044645&r1=1044644&r2=1044645&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/WicketAjaxReference.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/WicketAjaxReference.java
Sat Dec 11 12:48:38 2010
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.ajax;
-import org.apache.wicket.request.resource.JavascriptResourceReference;
+import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
/**
@@ -24,7 +24,7 @@ import org.apache.wicket.request.resourc
*
* @author Matej Knopp
*/
-public class WicketAjaxReference extends JavascriptResourceReference
+public class WicketAjaxReference extends JavaScriptResourceReference
{
private static final long serialVersionUID = 1L;
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WicketEventReference.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WicketEventReference.java?rev=1044645&r1=1044644&r2=1044645&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WicketEventReference.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WicketEventReference.java
Sat Dec 11 12:48:38 2010
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup.html;
-import org.apache.wicket.request.resource.JavascriptResourceReference;
+import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
/**
@@ -24,7 +24,7 @@ import org.apache.wicket.request.resourc
*
* @author ivaynberg
*/
-public class WicketEventReference extends JavascriptResourceReference
+public class WicketEventReference extends JavaScriptResourceReference
{
private static final long serialVersionUID = 1L;
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java?rev=1044645&r1=1044644&r2=1044645&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java
Sat Dec 11 12:48:38 2010
@@ -29,7 +29,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.protocol.http.IMultipartWebRequest;
import org.apache.wicket.request.Request;
-import org.apache.wicket.request.resource.JavascriptResourceReference;
+import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.convert.ConversionException;
import org.apache.wicket.util.string.Strings;
@@ -92,7 +92,7 @@ public class MultiFileUploadField extend
private static final String MAGIC_SEPARATOR = "_mf_";
- private static final ResourceReference JS = new
JavascriptResourceReference(
+ private static final ResourceReference JS = new
JavaScriptResourceReference(
MultiFileUploadField.class, "MultiFileUploadField.js");
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java?rev=1044645&r1=1044644&r2=1044645&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
Sat Dec 11 12:48:38 2010
@@ -45,7 +45,7 @@ import org.apache.wicket.model.IDetachab
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.IRequestHandler;
-import org.apache.wicket.request.resource.JavascriptResourceReference;
+import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.string.AppendingStringBuffer;
import org.apache.wicket.util.visit.IVisit;
@@ -1294,7 +1294,7 @@ public abstract class AbstractTree exten
return item.getMarkupId().substring(skip);
}
- private final static ResourceReference JAVASCRIPT = new
JavascriptResourceReference(
+ private final static ResourceReference JAVASCRIPT = new
JavaScriptResourceReference(
AbstractTree.class, "res/tree.js");
/**
Copied:
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/JavaScriptResourceReference.java
(from r1044640,
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/JavascriptResourceReference.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/JavaScriptResourceReference.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/JavaScriptResourceReference.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/JavascriptResourceReference.java&r1=1044640&r2=1044645&rev=1044645&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/JavascriptResourceReference.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/JavaScriptResourceReference.java
Sat Dec 11 12:48:38 2010
@@ -23,17 +23,17 @@ import java.util.Locale;
*
* @author Matej
*/
-public class JavascriptResourceReference extends PackageResourceReference
+public class JavaScriptResourceReference extends PackageResourceReference
{
private static final long serialVersionUID = 1L;
- public JavascriptResourceReference(Class<?> scope, String name, Locale
locale, String style,
+ public JavaScriptResourceReference(Class<?> scope, String name, Locale
locale, String style,
String variation)
{
super(scope, name, locale, style, variation);
}
- public JavascriptResourceReference(Class<?> scope, String name)
+ public JavaScriptResourceReference(Class<?> scope, String name)
{
super(scope, name);
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/PanelWithHeaderPart.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/PanelWithHeaderPart.java?rev=1044645&r1=1044644&r2=1044645&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/PanelWithHeaderPart.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/PanelWithHeaderPart.java
Sat Dec 11 12:48:38 2010
@@ -19,7 +19,7 @@ package org.apache.wicket.markup.parser.
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.request.resource.JavascriptResourceReference;
+import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.request.resource.PackageResourceReference;
/**
@@ -45,7 +45,7 @@ public class PanelWithHeaderPart extends
{
response.renderCSSReference(new
PackageResourceReference(PanelWithHeaderPart.class,
"test.css"));
- response.renderJavascriptReference(new
JavascriptResourceReference(
+ response.renderJavascriptReference(new
JavaScriptResourceReference(
PanelWithHeaderPart.class, "test.js"));
}
