You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jd...@apache.org on 2010/12/11 16:15:25 UTC
svn commit: r1044667 [1/2] - in /wicket/trunk:
wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/
wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/
wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/ w...
Author: jdonnerstag
Date: Sat Dec 11 15:15:21 2010
New Revision: 1044667
URL: http://svn.apache.org/viewvc?rev=1044667&view=rev
Log:
rename classes and methods from *Javascript* to *JavaScript*
Issue: WICKET-715
Modified:
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EffectsPage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/GuestBook.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalContent1Page.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/HomePage.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxIndicatorAppender.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanel.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/autocomplete/AbstractAutoCompleteRenderer.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.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/captcha/kittens/KittenCaptchaPanel.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/xml/CustomEntityResolver.java
wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityJavaScriptContributor.java
wicket/trunk/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavaScriptPage.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.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/IAjaxCallDecorator.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/javascript/IJavaScriptCompressor.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/DecoratingHeaderResponse.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/IHeaderContributor.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/IHeaderResponse.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractTextComponent.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/SubmitLink.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/internal/HeaderResponse.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/ResourceUtil.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/aggregation/AbstractResourceAggregatingHeaderResponse.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/dependencies/AbstractResourceDependentResourceReference.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/dependencies/ResourceReferenceDependencyInjectingHeaderResponse.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/AbstractHeaderResponseFilter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/CssAcceptingHeaderResponseFilter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/HeaderResponseContainerFilteringHeaderResponse.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/JavaScriptFilteredIntoFooterHeaderResponse.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/OppositeHeaderResponseFilter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IResourceSettings.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/def/ResourceSettings.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/JavaScriptUtils.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/PackagedTextTemplate.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContribution.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContribution2.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkTest.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/YuiLib.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java?rev=1044667&r1=1044666&r2=1044667&view=diff
==============================================================================
--- wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java (original)
+++ wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java Sat Dec 11 15:15:21 2010
@@ -43,7 +43,7 @@ public final class YuiLib
*/
public static void load(IHeaderResponse response)
{
- response.renderJavascriptReference(getYuiLoader());
+ response.renderJavaScriptReference(getYuiLoader());
}
private static ResourceReference getYuiLoader()
Modified: wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java?rev=1044667&r1=1044666&r2=1044667&view=diff
==============================================================================
--- wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java (original)
+++ wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java Sat Dec 11 15:15:21 2010
@@ -108,12 +108,12 @@ public abstract class AbstractCalendar e
/**
* Gets the id of the javascript widget. Note that this is the non-namespaced id, so depending
* on what you want to do with it, you may need to prepend 'YAHOO.wicket.' to it. Or you can
- * call {@link #getJavascriptWidgetId()}.
+ * call {@link #getJavaScriptWidgetId()}.
*
* @return The javascript id
- * @see #getJavascriptWidgetId()
+ * @see #getJavaScriptWidgetId()
*/
- public final String getJavascriptId()
+ public final String getJavaScriptId()
{
return getMarkupId() + "Js";
}
@@ -122,11 +122,11 @@ public abstract class AbstractCalendar e
* The name spaced id of the widget.
*
* @return The widget id
- * @see #getJavascriptId()
+ * @see #getJavaScriptId()
*/
- public final String getJavascriptWidgetId()
+ public final String getJavaScriptWidgetId()
{
- return "YAHOO.wicket." + getJavascriptId();
+ return "YAHOO.wicket." + getJavaScriptId();
}
/**
@@ -137,9 +137,9 @@ public abstract class AbstractCalendar e
*/
private void contributeDependencies(IHeaderResponse response)
{
- response.renderJavascriptReference(new PackageResourceReference(YuiLib.class,
+ response.renderJavaScriptReference(new PackageResourceReference(YuiLib.class,
"yahoodomevent/yahoo-dom-event.js"));
- response.renderJavascriptReference(new PackageResourceReference(AbstractCalendar.class,
+ response.renderJavaScriptReference(new PackageResourceReference(AbstractCalendar.class,
"calendar-min.js"));
response.renderCSSReference(new PackageResourceReference(AbstractCalendar.class,
"assets/skins/sam/calendar.css"));
@@ -189,8 +189,8 @@ public abstract class AbstractCalendar e
// not pretty to look at, but cheaper than using a template
String markupId = AbstractCalendar.this.getMarkupId();
- String javascriptId = getJavascriptId();
- String javascriptWidgetId = getJavascriptWidgetId();
+ String javascriptId = getJavaScriptId();
+ String javascriptWidgetId = getJavaScriptWidgetId();
StringBuilder b = new StringBuilder();
b.append(JavaScriptUtils.SCRIPT_OPEN_TAG);
// initialize wicket namespace and register the init function
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=1044667&r1=1044666&r2=1044667&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 15:15:21 2010
@@ -249,7 +249,7 @@ public class DatePicker extends Behavior
variables.put("allowRollup", true);
}
- String script = getAdditionalJavascript();
+ String script = getAdditionalJavaScript();
if (script != null)
{
variables.put("additionalJavascript",
@@ -325,7 +325,7 @@ public class DatePicker extends Behavior
// render initialization script with the variables interpolated
TextTemplate datePickerJs = new PackagedTextTemplate(DatePicker.class, "DatePicker.js");
datePickerJs.interpolate(variables);
- response.renderOnDomReadyJavascript(datePickerJs.asString());
+ response.renderOnDomReadyJavaScript(datePickerJs.asString());
// remove previously generated markup (see onRendered) via javascript in
// ajax requests to not render the yui calendar multiple times
@@ -339,7 +339,7 @@ public class DatePicker extends Behavior
escapedComponentMarkupId + "DpJs.destroy(); delete YAHOO.wicket." +
escapedComponentMarkupId + "DpJs;";
- response.renderJavascript(javascript, null);
+ response.renderJavaScript(javascript, null);
}
}
@@ -621,7 +621,7 @@ public class DatePicker extends Behavior
/**
* Whether to notify the associated component when a date is selected. Notifying is done by
- * calling the associated component's onchange Javascript event handler. You can for instance
+ * calling the associated component's onchange JavaScript event handler. You can for instance
* attach an {@link AjaxEventBehavior} to that component to get a call back to the server. The
* default is true.
*
@@ -743,7 +743,7 @@ public class DatePicker extends Behavior
}
/**
- * Override this method to further customize the YUI Calendar with additional Javascript code.
+ * Override this method to further customize the YUI Calendar with additional JavaScript code.
* The code returned by this method is executed right after the Calendar has been constructed
* and initialized. To refer to the actual Calendar DOM object, use <code>${calendar}</code> in
* your code.<br/>
@@ -752,16 +752,16 @@ public class DatePicker extends Behavior
* Example:
*
* <pre>
- * protected String getAdditionalJavascript()
+ * protected String getAdditionalJavaScript()
* {
* return "${calendar}.addRenderer(\"10/3\", ${calendar}.renderCellStyleHighlight1);";
* }
* </pre>
*
- * @return a String containing additional Javascript code
+ * @return a String containing additional JavaScript code
*
*/
- protected String getAdditionalJavascript()
+ protected String getAdditionalJavaScript()
{
return "";
}
Modified: wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java?rev=1044667&r1=1044666&r2=1044667&view=diff
==============================================================================
--- wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java (original)
+++ wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java Sat Dec 11 15:15:21 2010
@@ -129,7 +129,7 @@ public class DebugBar extends DevUtilsPa
public void renderHead(IHeaderResponse response)
{
response.renderCSSReference(new CompressedResourceReference(DebugBar.class, "wicket-debugbar.css"));
- response.renderJavascriptReference(new JavaScriptResourceReference(DebugBar.class, "wicket-debugbar.js"));
+ response.renderJavaScriptReference(new JavaScriptResourceReference(DebugBar.class, "wicket-debugbar.js"));
}
/**
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EffectsPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EffectsPage.java?rev=1044667&r1=1044666&r2=1044667&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EffectsPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EffectsPage.java Sat Dec 11 15:15:21 2010
@@ -84,7 +84,7 @@ public class EffectsPage extends BasePag
{
counter1++;
target.add(c1);
- target.appendJavascript("new Effect.Shake($('" + c1.getMarkupId() + "'));");
+ target.appendJavaScript("new Effect.Shake($('" + c1.getMarkupId() + "'));");
}
});
@@ -97,7 +97,7 @@ public class EffectsPage extends BasePag
if (target != null)
{
target.add(c2);
- target.appendJavascript("new Effect.Highlight($('" + c2.getMarkupId() + "'));");
+ target.appendJavaScript("new Effect.Highlight($('" + c2.getMarkupId() + "'));");
}
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/GuestBook.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/GuestBook.java?rev=1044667&r1=1044666&r2=1044667&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/GuestBook.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/GuestBook.java Sat Dec 11 15:15:21 2010
@@ -116,7 +116,7 @@ public class GuestBook extends BasePage
target.add(text);
// focus the textarea again
- target.appendJavascript("document.getElementById('" + text.getMarkupId() +
+ target.appendJavaScript("document.getElementById('" + text.getMarkupId() +
"').focus();");
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalContent1Page.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalContent1Page.java?rev=1044667&r1=1044666&r2=1044667&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalContent1Page.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalContent1Page.java Sat Dec 11 15:15:21 2010
@@ -88,7 +88,7 @@ public class ModalContent1Page extends W
{
public boolean onCloseButtonClicked(AjaxRequestTarget target)
{
- target.appendJavascript("alert('You can\\'t close this modal window using close button."
+ target.appendJavaScript("alert('You can\\'t close this modal window using close button."
+ " Use the link inside the window instead.');");
return false;
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/HomePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/HomePage.java?rev=1044667&r1=1044666&r2=1044667&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/HomePage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/HomePage.java Sat Dec 11 15:15:21 2010
@@ -54,18 +54,18 @@ public class HomePage extends WicketExam
{
if (!isSpamBot() && captcha.allKittensSelected())
{
- target.appendJavascript("alert('you win! happy kittens!');");
+ target.appendJavaScript("alert('you win! happy kittens!');");
}
else
{
errors++;
if (isSpamBot())
{
- target.appendJavascript("alert('spammer alert');");
+ target.appendJavaScript("alert('spammer alert');");
}
else
{
- target.appendJavascript("alert('please try again');");
+ target.appendJavaScript("alert('please try again');");
}
target.add(captcha);
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java?rev=1044667&r1=1044666&r2=1044667&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java Sat Dec 11 15:15:21 2010
@@ -438,7 +438,7 @@ public class AjaxEditableLabel<T> extend
target.add(AjaxEditableLabel.this);
// put focus on the textfield and stupid explorer hack to move the
// caret to the end
- target.appendJavascript("{ var el=wicketGet('" + editor.getMarkupId() + "');" +
+ target.appendJavaScript("{ var el=wicketGet('" + editor.getMarkupId() + "');" +
" if (el.createTextRange) { " +
" var v = el.value; var r = el.createTextRange(); " +
" r.moveStart('character', v.length); r.select(); } }");
@@ -456,10 +456,10 @@ public class AjaxEditableLabel<T> extend
Serializable errorMessage = editor.getFeedbackMessage().getMessage();
if (errorMessage instanceof String)
{
- target.appendJavascript("window.status='" +
+ target.appendJavaScript("window.status='" +
JavaScriptUtils.escapeQuotes((String)errorMessage) + "';");
}
- target.appendJavascript("{var el=wicketGet('" + editor.getMarkupId() +
+ target.appendJavaScript("{var el=wicketGet('" + editor.getMarkupId() +
"'); el.select(); el.focus();}");
target.add(editor);
}
@@ -478,7 +478,7 @@ public class AjaxEditableLabel<T> extend
editor.setVisible(false);
target.add(AjaxEditableLabel.this);
- target.appendJavascript("window.status='';");
+ target.appendJavaScript("window.status='';");
}
/**
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxIndicatorAppender.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxIndicatorAppender.java?rev=1044667&r1=1044666&r2=1044667&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxIndicatorAppender.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxIndicatorAppender.java Sat Dec 11 15:15:21 2010
@@ -68,7 +68,7 @@ public class AjaxIndicatorAppender exten
final String javascript = "var e = Wicket.$('" + getMarkupId() +
"'); if (e != null && typeof(e.parentNode) != 'undefined') e.parentNode.removeChild(e);";
- response.renderJavascript(javascript, null);
+ response.renderJavaScript(javascript, null);
}
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanel.java?rev=1044667&r1=1044666&r2=1044667&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanel.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanel.java Sat Dec 11 15:15:21 2010
@@ -106,7 +106,7 @@ public abstract class AjaxLazyLoadPanel
*/
protected void handleCallbackScript(final IHeaderResponse response, final String callbackScript)
{
- response.renderOnDomReadyJavascript(callbackScript);
+ response.renderOnDomReadyJavaScript(callbackScript);
}
/**
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=1044667&r1=1044666&r2=1044667&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 15:15:21 2010
@@ -80,7 +80,7 @@ public abstract class AbstractAutoComple
*/
private void renderAutocompleteHead(IHeaderResponse response)
{
- response.renderJavascriptReference(AUTOCOMPLETE_JS);
+ response.renderJavaScriptReference(AUTOCOMPLETE_JS);
final String id = getComponent().getMarkupId();
String indicatorId = findIndicatorId();
@@ -95,7 +95,7 @@ public abstract class AbstractAutoComple
String initJS = String.format("new Wicket.AutoComplete('%s','%s',%s,%s);", id,
getCallbackUrl(), constructSettingsJS(), indicatorId);
- response.renderOnDomReadyJavascript(initJS);
+ response.renderOnDomReadyJavaScript(initJS);
}
protected final String constructSettingsJS()
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteRenderer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteRenderer.java?rev=1044667&r1=1044666&r2=1044667&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteRenderer.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteRenderer.java Sat Dec 11 15:15:21 2010
@@ -54,7 +54,7 @@ public abstract class AbstractAutoComple
textValue = textValue.replaceAll("\\\"", """);
response.write("<li textvalue=\"" + textValue + "\"");
- final CharSequence handler = getOnSelectJavascriptExpression(object);
+ final CharSequence handler = getOnSelectJavaScriptExpression(object);
if (handler != null)
response.write(" onselect=\"" + handler + '"');
response.write(">");
@@ -114,7 +114,7 @@ public abstract class AbstractAutoComple
* example 1:
*
* <pre>
- * protected CharSequence getOnSelectJavascript(Address address)
+ * protected CharSequence getOnSelectJavaScript(Address address)
* {
* final StringBuilder js = new StringBuilder();
* js.append("wicketGet('street').value ='" + address.getStreet() + "';");
@@ -128,7 +128,7 @@ public abstract class AbstractAutoComple
* example 2:
*
* <pre>
- * protected CharSequence getOnSelectJavascript(Currency currency)
+ * protected CharSequence getOnSelectJavaScript(Currency currency)
* {
* final StringBuilder js = new StringBuilder();
* js.append("val rate = ajaxGetExchangeRateForCurrency(currencySymbol);");
@@ -145,7 +145,7 @@ public abstract class AbstractAutoComple
* @return javascript to execute on selection or <code>null</code> if default behavior is
* intented
*/
- protected CharSequence getOnSelectJavascriptExpression(T item)
+ protected CharSequence getOnSelectJavaScriptExpression(T item)
{
return null;
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java?rev=1044667&r1=1044666&r2=1044667&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java Sat Dec 11 15:15:21 2010
@@ -159,8 +159,8 @@ public class UploadProgressBar extends P
public void renderHead(IHeaderResponse response)
{
super.renderHead(response);
- response.renderJavascriptReference(WicketEventReference.INSTANCE);
- response.renderJavascriptReference(JS);
+ response.renderJavaScriptReference(WicketEventReference.INSTANCE);
+ response.renderJavaScriptReference(JS);
ResourceReference css = getCss();
if (css != null)
{
@@ -171,7 +171,7 @@ public class UploadProgressBar extends P
final String uploadFieldId = (uploadField == null) ? "" : uploadField.getMarkupId();
- response.renderOnDomReadyJavascript("Wicket.Event.add(document.getElementById('" +
+ response.renderOnDomReadyJavaScript("Wicket.Event.add(document.getElementById('" +
form.getRootForm().getMarkupId() + "'), 'submit', function() {" +
"if (!document.getElementById('" + statusDiv.getMarkupId() + "')) return;" +
"var def=new Wicket.WUPB.Def('" + getMarkupId() + "', '" + statusDiv.getMarkupId() +
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=1044667&r1=1044666&r2=1044667&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 15:15:21 2010
@@ -263,7 +263,7 @@ public class ModalWindow extends Panel
public void renderHead(IHeaderResponse response)
{
super.renderHead(response);
- response.renderJavascriptReference(JAVASCRIPT);
+ response.renderJavaScriptReference(JAVASCRIPT);
response.renderCSSReference(CSS);
}
@@ -331,7 +331,7 @@ public class ModalWindow extends Panel
{
getContent().setVisible(true);
target.add(this);
- target.appendJavascript(getWindowOpenJavascript());
+ target.appendJavaScript(getWindowOpenJavaScript());
shown = true;
}
}
@@ -346,7 +346,7 @@ public class ModalWindow extends Panel
*/
public static final void closeCurrent(AjaxRequestTarget target)
{
- target.appendJavascript(getCloseJavacriptInternal());
+ target.appendJavaScript(getCloseJavacriptInternal());
}
/**
@@ -362,7 +362,7 @@ public class ModalWindow extends Panel
{
target.add(getContent());
}
- target.appendJavascript(getCloseJavacript());
+ target.appendJavaScript(getCloseJavacript());
shown = false;
}
@@ -371,7 +371,7 @@ public class ModalWindow extends Panel
*
* @return the script that actually shows the window.
*/
- protected CharSequence getShowJavascript()
+ protected CharSequence getShowJavaScript()
{
return "Wicket.Window.create(settings).show();\n";
}
@@ -989,7 +989,7 @@ public class ModalWindow extends Panel
*
* @return javascript that opens the window
*/
- protected final String getWindowOpenJavascript()
+ protected final String getWindowOpenJavaScript()
{
AppendingStringBuffer buffer = new AppendingStringBuffer(500);
@@ -1090,7 +1090,7 @@ public class ModalWindow extends Panel
postProcessSettings(buffer);
- buffer.append(getShowJavascript());
+ buffer.append(getShowJavaScript());
return buffer.toString();
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java?rev=1044667&r1=1044666&r2=1044667&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java Sat Dec 11 15:15:21 2010
@@ -203,13 +203,13 @@ public class KittenCaptchaPanel extends
javascript.append((url.toString().indexOf('?') > -1 ? "&" : "?") + "rand=" +
Math.random());
javascript.append("'");
- target.appendJavascript(javascript.toString());
+ target.appendJavaScript(javascript.toString());
}
else
{
// The user didn't click on an animal, so hide the loading
// indicator
- target.appendJavascript(" hideLoadingIndicator();");
+ target.appendJavaScript(" hideLoadingIndicator();");
}
// Update the selection label
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=1044667&r1=1044666&r2=1044667&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 15:15:21 2010
@@ -620,7 +620,7 @@ public class Palette<T> extends Panel
@Override
public void renderHead(IHeaderResponse response)
{
- response.renderJavascriptReference(JAVASCRIPT);
+ response.renderJavaScriptReference(JAVASCRIPT);
ResourceReference css = getCSS();
if (css != null)
{
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/xml/CustomEntityResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/xml/CustomEntityResolver.java?rev=1044667&r1=1044666&r2=1044667&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/xml/CustomEntityResolver.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/xml/CustomEntityResolver.java Sat Dec 11 15:15:21 2010
@@ -139,6 +139,11 @@ public class CustomEntityResolver implem
*/
public static interface EntityLocator
{
+ /**
+ * @return
+ * @throws SAXException
+ * @throws IOException
+ */
InputSource locateInputSource() throws SAXException, IOException;
}
Modified: wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityJavaScriptContributor.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityJavaScriptContributor.java?rev=1044667&r1=1044666&r2=1044667&view=diff
==============================================================================
--- wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityJavaScriptContributor.java (original)
+++ wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityJavaScriptContributor.java Sat Dec 11 15:15:21 2010
@@ -26,7 +26,7 @@ import org.apache.wicket.util.lang.Packa
/**
* A derivation of VelocityContributor that uses
- * {@link org.apache.wicket.markup.html.IHeaderResponse#renderJavascript(CharSequence, String)}
+ * {@link org.apache.wicket.markup.html.IHeaderResponse#renderJavaScript(CharSequence, String)}
*/
public class VelocityJavaScriptContributor extends VelocityContributor
{
@@ -75,7 +75,7 @@ public class VelocityJavaScriptContribut
CharSequence s = evaluate();
if (s != null)
{
- response.renderJavascript(s, id);
+ response.renderJavaScript(s, id);
}
}
}
Modified: wicket/trunk/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavaScriptPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavaScriptPage.java?rev=1044667&r1=1044666&r2=1044667&view=diff
==============================================================================
--- wicket/trunk/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavaScriptPage.java (original)
+++ wicket/trunk/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavaScriptPage.java Sat Dec 11 15:15:21 2010
@@ -40,7 +40,7 @@ public class VelocityJavaScriptPage exte
String id = "000001";
String javascript = "msg1: Stoopid test 1\nmsg2: Stooopid test 2";
- JavaScriptUtils.writeJavascript(getResponse(), javascript, id);
+ JavaScriptUtils.writeJavaScript(getResponse(), javascript, id);
IModel<MiniMap<String, String>> model = new Model<MiniMap<String, String>>()
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java?rev=1044667&r1=1044666&r2=1044667&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java Sat Dec 11 15:15:21 2010
@@ -299,7 +299,7 @@ public abstract class Application implem
getDebugSettings().setAjaxDebugModeEnabled(true);
getDebugSettings().setDevelopmentUtilitiesEnabled(true);
// getDebugSettings().setOutputMarkupContainerClassName(true);
- getResourceSettings().setJavascriptCompressor(null);
+ getResourceSettings().setJavaScriptCompressor(null);
getRequestCycleSettings().addResponseFilter(EmptySrcAttributeCheckFilter.INSTANCE);
break;
}
@@ -311,7 +311,7 @@ public abstract class Application implem
IExceptionSettings.SHOW_INTERNAL_ERROR_PAGE);
getDebugSettings().setAjaxDebugModeEnabled(false);
getDebugSettings().setDevelopmentUtilitiesEnabled(false);
- getResourceSettings().setJavascriptCompressor(new DefaultJavaScriptCompressor());
+ getResourceSettings().setJavaScriptCompressor(new DefaultJavaScriptCompressor());
break;
}
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java?rev=1044667&r1=1044666&r2=1044667&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java Sat Dec 11 15:15:21 2010
@@ -103,7 +103,7 @@ public abstract class AbstractAjaxTimerB
if (!stopped && (!headRendered || !request.isAjax()))
{
headRendered = true;
- response.renderOnLoadJavascript(getJsTimeoutCall(updateInterval));
+ response.renderOnLoadJavaScript(getJsTimeoutCall(updateInterval));
}
}
@@ -157,7 +157,7 @@ public abstract class AbstractAjaxTimerB
if (!stopped && isEnabled(getComponent()))
{
- target.getHeaderResponse().renderOnLoadJavascript(getJsTimeoutCall(updateInterval));
+ target.getHeaderResponse().renderOnLoadJavaScript(getJsTimeoutCall(updateInterval));
}
}
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=1044667&r1=1044666&r2=1044667&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 15:15:21 2010
@@ -71,17 +71,17 @@ public abstract class AbstractDefaultAja
{
final IDebugSettings debugSettings = Application.get().getDebugSettings();
- response.renderJavascriptReference(WicketEventReference.INSTANCE);
- response.renderJavascriptReference(WicketAjaxReference.INSTANCE);
+ response.renderJavaScriptReference(WicketEventReference.INSTANCE);
+ response.renderJavaScriptReference(WicketAjaxReference.INSTANCE);
if (debugSettings.isAjaxDebugModeEnabled())
{
- response.renderJavascriptReference(JAVASCRIPT_DEBUG);
- response.renderJavascript("wicketAjaxDebugEnable=true;", "wicket-ajax-debug-enable");
+ response.renderJavaScriptReference(JAVASCRIPT_DEBUG);
+ response.renderJavaScript("wicketAjaxDebugEnable=true;", "wicket-ajax-debug-enable");
}
// TODO NG Escape
- response.renderJavascript("Wicket.Ajax.baseUrl=\"" +
+ response.renderJavaScript("Wicket.Ajax.baseUrl=\"" +
RequestCycle.get().getUrlRenderer().getBaseUrl() + "\";", "wicket-ajax-base-url");
}
@@ -152,7 +152,7 @@ public abstract class AbstractDefaultAja
* {@link AbstractDefaultAjaxBehavior#getAjaxCallDecorator()}.
*
* @param partialCall
- * Javascript of a partial call to the function performing the actual ajax callback.
+ * JavaScript of a partial call to the function performing the actual ajax callback.
* Must be in format <code>function(params,</code> with signature
* <code>function(params, onSuccessHandler, onFailureHandler</code>. Example:
* <code>wicketAjaxGet('callbackurl'</code>
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=1044667&r1=1044666&r2=1044667&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 15:15:21 2010
@@ -74,7 +74,7 @@ import org.slf4j.LoggerFactory;
* MarkupIdSetter )
* <p>
* Any javascript that needs to be evaluated on the client side can be added using
- * AjaxRequestTarget#append/prependJavascript(String). For example, this feature can be useful when
+ * AjaxRequestTarget#append/prependJavaScript(String). For example, this feature can be useful when
* it is desirable to link component update with some javascript effects.
* <p>
* The target provides a listener interface {@link IListener} that can be used to add code that
@@ -226,9 +226,9 @@ public class AjaxRequestTarget implement
private static final Logger LOG = LoggerFactory.getLogger(AjaxRequestTarget.class);
- private final List<CharSequence> appendJavascripts = new ArrayList<CharSequence>();
+ private final List<CharSequence> appendJavaScripts = new ArrayList<CharSequence>();
- private final List<CharSequence> domReadyJavascripts = new ArrayList<CharSequence>();
+ private final List<CharSequence> domReadyJavaScripts = new ArrayList<CharSequence>();
/**
* Create a response for component body and javascript that will escape output to make it safe
@@ -246,7 +246,7 @@ public class AjaxRequestTarget implement
private final Map<String, Component> markupIdToComponent = new LinkedHashMap<String, Component>();
/** */
- private final List<CharSequence> prependJavascripts = new ArrayList<CharSequence>();
+ private final List<CharSequence> prependJavaScripts = new ArrayList<CharSequence>();
/** a list of listeners */
private List<IListener> listeners = null;
@@ -325,7 +325,6 @@ public class AjaxRequestTarget implement
parent.visitChildren(childCriteria, new IVisitor<Component, Void>()
{
-
public void component(final Component component, final IVisit<Void> visit)
{
add(component);
@@ -453,7 +452,7 @@ public class AjaxRequestTarget implement
component.toString());
}
final String id = component != null ? ("'" + component.getMarkupId() + "'") : "null";
- appendJavascript("Wicket.Focus.setFocusOnId(" + id + ");");
+ appendJavaScript("Wicket.Focus.setFocusOnId(" + id + ");");
}
/**
@@ -461,14 +460,14 @@ public class AjaxRequestTarget implement
*
* @param javascript
*/
- public final void appendJavascript(CharSequence javascript)
+ public final void appendJavaScript(CharSequence javascript)
{
if (javascript == null)
{
throw new IllegalArgumentException("javascript cannot be null");
}
- appendJavascripts.add(javascript);
+ appendJavaScripts.add(javascript);
}
/**
@@ -498,8 +497,8 @@ public class AjaxRequestTarget implement
{
AjaxRequestTarget that = (AjaxRequestTarget)obj;
return markupIdToComponent.equals(that.markupIdToComponent) &&
- prependJavascripts.equals(that.prependJavascripts) &&
- appendJavascripts.equals(that.appendJavascripts);
+ prependJavaScripts.equals(that.prependJavaScripts) &&
+ appendJavaScripts.equals(that.appendJavaScripts);
}
return false;
}
@@ -512,8 +511,8 @@ public class AjaxRequestTarget implement
{
int result = "AjaxRequestTarget".hashCode();
result += markupIdToComponent.hashCode() * 17;
- result += prependJavascripts.hashCode() * 17;
- result += appendJavascripts.hashCode() * 17;
+ result += prependJavaScripts.hashCode() * 17;
+ result += appendJavaScripts.hashCode() * 17;
return result;
}
@@ -522,14 +521,14 @@ public class AjaxRequestTarget implement
*
* @param javascript
*/
- public final void prependJavascript(CharSequence javascript)
+ public final void prependJavaScript(CharSequence javascript)
{
if (javascript == null)
{
throw new IllegalArgumentException("javascript cannot be null");
}
- prependJavascripts.add(javascript);
+ prependJavaScripts.add(javascript);
}
/**
@@ -610,7 +609,7 @@ public class AjaxRequestTarget implement
fireOnBeforeRespondListeners();
// normal behavior
- Iterator<CharSequence> it = prependJavascripts.iterator();
+ Iterator<CharSequence> it = prependJavaScripts.iterator();
while (it.hasNext())
{
CharSequence js = it.next();
@@ -624,13 +623,13 @@ public class AjaxRequestTarget implement
// execute the dom ready javascripts as first javascripts
// after component replacement
- it = domReadyJavascripts.iterator();
+ it = domReadyJavaScripts.iterator();
while (it.hasNext())
{
CharSequence js = it.next();
respondInvocation(response, js);
}
- it = appendJavascripts.iterator();
+ it = appendJavaScripts.iterator();
while (it.hasNext())
{
CharSequence js = it.next();
@@ -768,8 +767,8 @@ public class AjaxRequestTarget implement
public String toString()
{
return "[AjaxRequestTarget@" + hashCode() + " markupIdToComponent [" + markupIdToComponent +
- "], prependJavascript [" + prependJavascripts + "], appendJavascript [" +
- appendJavascripts + "]";
+ "], prependJavaScript [" + prependJavaScripts + "], appendJavaScript [" +
+ appendJavaScripts + "]";
}
/**
@@ -922,7 +921,7 @@ public class AjaxRequestTarget implement
{
if (headerRendering == false)
{
- LOG.debug("Only methods that can be called on IHeaderResponse outside renderHead() are renderOnLoadJavascript and renderOnDomReadyJavascript");
+ LOG.debug("Only methods that can be called on IHeaderResponse outside renderHead() are renderOnLoadJavaScript and renderOnDomReadyJavaScript");
}
return headerRendering;
@@ -956,11 +955,11 @@ public class AjaxRequestTarget implement
}
@Override
- public void renderJavascript(CharSequence javascript, String id)
+ public void renderJavaScript(CharSequence javascript, String id)
{
if (checkHeaderRendering())
{
- super.renderJavascript(javascript, id);
+ super.renderJavaScript(javascript, id);
}
}
@@ -974,38 +973,38 @@ public class AjaxRequestTarget implement
}
@Override
- public void renderJavascriptReference(ResourceReference reference)
+ public void renderJavaScriptReference(ResourceReference reference)
{
if (checkHeaderRendering())
{
- super.renderJavascriptReference(reference);
+ super.renderJavaScriptReference(reference);
}
}
@Override
- public void renderJavascriptReference(ResourceReference reference, String id)
+ public void renderJavaScriptReference(ResourceReference reference, String id)
{
if (checkHeaderRendering())
{
- super.renderJavascriptReference(reference, id);
+ super.renderJavaScriptReference(reference, id);
}
}
@Override
- public void renderJavascriptReference(String url)
+ public void renderJavaScriptReference(String url)
{
if (checkHeaderRendering())
{
- super.renderJavascriptReference(url);
+ super.renderJavaScriptReference(url);
}
}
@Override
- public void renderJavascriptReference(String url, String id)
+ public void renderJavaScriptReference(String url, String id)
{
if (checkHeaderRendering())
{
- super.renderJavascriptReference(url, id);
+ super.renderJavaScriptReference(url, id);
}
}
@@ -1027,31 +1026,31 @@ public class AjaxRequestTarget implement
/**
*
- * @see org.apache.wicket.markup.html.internal.HeaderResponse#renderOnDomReadyJavascript(java.lang.String)
+ * @see org.apache.wicket.markup.html.internal.HeaderResponse#renderOnDomReadyJavaScript(java.lang.String)
*/
@Override
- public void renderOnDomReadyJavascript(String javascript)
+ public void renderOnDomReadyJavaScript(String javascript)
{
List<String> token = Arrays.asList("javascript-event", "window", "domready", javascript);
if (wasRendered(token) == false)
{
- domReadyJavascripts.add(javascript);
+ domReadyJavaScripts.add(javascript);
markRendered(token);
}
}
/**
*
- * @see org.apache.wicket.markup.html.internal.HeaderResponse#renderOnLoadJavascript(java.lang.String)
+ * @see org.apache.wicket.markup.html.internal.HeaderResponse#renderOnLoadJavaScript(java.lang.String)
*/
@Override
- public void renderOnLoadJavascript(String javascript)
+ public void renderOnLoadJavaScript(String javascript)
{
List<String> token = Arrays.asList("javascript-event", "window", "load", javascript);
if (wasRendered(token) == false)
{
// execute the javascript after all other scripts are executed
- appendJavascripts.add(javascript);
+ appendJavaScripts.add(javascript);
markRendered(token);
}
}
@@ -1076,7 +1075,7 @@ public class AjaxRequestTarget implement
/**
* Returns the header response associated with current AjaxRequestTarget.
*
- * Beware that only renderOnDomReadyJavascript and renderOnLoadJavascript can be called outside
+ * Beware that only renderOnDomReadyJavaScript and renderOnLoadJavaScript can be called outside
* the renderHeader(IHeaderResponse response) method. Calls to other render** methods will
* result in an exception being thrown.
*
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/IAjaxCallDecorator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/IAjaxCallDecorator.java?rev=1044667&r1=1044666&r2=1044667&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/IAjaxCallDecorator.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/IAjaxCallDecorator.java Sat Dec 11 15:15:21 2010
@@ -31,7 +31,7 @@ import org.apache.wicket.IClusterable;
*
* As a result, using double quotes in the script will break the link syntax and make it fail (or
* fallback in the case of an AjaxFallbackLink). So, if single quotes have to be inserted in strings
- * contained in the scripts, they must be properly escaped to pass through Java and Javascript, for
+ * contained in the scripts, they must be properly escaped to pass through Java and JavaScript, for
* example:
*
* <pre>
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java?rev=1044667&r1=1044666&r2=1044667&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java Sat Dec 11 15:15:21 2010
@@ -76,9 +76,9 @@ public abstract class AjaxFormChoiceComp
asb.append(" }\n");
asb.append("}\n");
- response.renderJavascript(asb, "attachChoice");
+ response.renderJavaScript(asb, "attachChoice");
- response.renderOnLoadJavascript("attachChoiceHandlers('" + getComponent().getMarkupId() +
+ response.renderOnLoadJavaScript("attachChoiceHandlers('" + getComponent().getMarkupId() +
"', function() {" + getEventHandler() + "});");
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/javascript/IJavaScriptCompressor.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/javascript/IJavaScriptCompressor.java?rev=1044667&r1=1044666&r2=1044667&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/javascript/IJavaScriptCompressor.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/javascript/IJavaScriptCompressor.java Sat Dec 11 15:15:21 2010
@@ -27,7 +27,7 @@ public interface IJavaScriptCompressor
* Remove comments and whitespaces from the javascript
*
* @param original
- * @return compressed Javascript
+ * @return compressed JavaScript
*/
public String compress(String original);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/DecoratingHeaderResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/DecoratingHeaderResponse.java?rev=1044667&r1=1044666&r2=1044667&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/DecoratingHeaderResponse.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/DecoratingHeaderResponse.java Sat Dec 11 15:15:21 2010
@@ -56,29 +56,29 @@ public abstract class DecoratingHeaderRe
return realResponse;
}
- public void renderJavascriptReference(ResourceReference reference)
+ public void renderJavaScriptReference(ResourceReference reference)
{
- realResponse.renderJavascriptReference(reference);
+ realResponse.renderJavaScriptReference(reference);
}
- public void renderJavascriptReference(ResourceReference reference, String id)
+ public void renderJavaScriptReference(ResourceReference reference, String id)
{
- realResponse.renderJavascriptReference(reference, id);
+ realResponse.renderJavaScriptReference(reference, id);
}
- public void renderJavascriptReference(String url)
+ public void renderJavaScriptReference(String url)
{
- realResponse.renderJavascriptReference(url);
+ realResponse.renderJavaScriptReference(url);
}
- public void renderJavascriptReference(String url, String id)
+ public void renderJavaScriptReference(String url, String id)
{
- realResponse.renderJavascriptReference(url, id);
+ realResponse.renderJavaScriptReference(url, id);
}
- public void renderJavascript(CharSequence javascript, String id)
+ public void renderJavaScript(CharSequence javascript, String id)
{
- realResponse.renderJavascript(javascript, id);
+ realResponse.renderJavaScript(javascript, id);
}
public void renderCSSReference(ResourceReference reference)
@@ -121,19 +121,19 @@ public abstract class DecoratingHeaderRe
return realResponse.getResponse();
}
- public void renderOnDomReadyJavascript(String javascript)
+ public void renderOnDomReadyJavaScript(String javascript)
{
- realResponse.renderOnDomReadyJavascript(javascript);
+ realResponse.renderOnDomReadyJavaScript(javascript);
}
- public void renderOnLoadJavascript(String javascript)
+ public void renderOnLoadJavaScript(String javascript)
{
- realResponse.renderOnLoadJavascript(javascript);
+ realResponse.renderOnLoadJavaScript(javascript);
}
- public void renderOnEventJavascript(String target, String event, String javascript)
+ public void renderOnEventJavaScript(String target, String event, String javascript)
{
- realResponse.renderOnEventJavascript(target, event, javascript);
+ realResponse.renderOnEventJavaScript(target, event, javascript);
}
public void close()
@@ -145,5 +145,4 @@ public abstract class DecoratingHeaderRe
{
return realResponse.isClosed();
}
-
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/IHeaderContributor.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/IHeaderContributor.java?rev=1044667&r1=1044666&r2=1044667&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/IHeaderContributor.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/IHeaderContributor.java Sat Dec 11 15:15:21 2010
@@ -34,7 +34,7 @@ import org.apache.wicket.IClusterable;
*
* public void renderHead(IHeaderResponse response)
* {
- * response.renderOnLoadJavascript("alert('page loaded!');");
+ * response.renderOnLoadJavaScript("alert('page loaded!');");
* }
* }
* </pre>
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/IHeaderResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/IHeaderResponse.java?rev=1044667&r1=1044666&r2=1044667&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/IHeaderResponse.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/IHeaderResponse.java Sat Dec 11 15:15:21 2010
@@ -16,11 +16,11 @@
*/
package org.apache.wicket.markup.html;
+import java.io.Closeable;
+
import org.apache.wicket.request.Response;
import org.apache.wicket.request.resource.ResourceReference;
-import java.io.Closeable;
-
/**
* Interface that is used to render header elements (usually javascript and CSS references).
*
@@ -37,7 +37,7 @@ public interface IHeaderResponse extends
* @param reference
* resource reference pointing to the javascript resource
*/
- public void renderJavascriptReference(ResourceReference reference);
+ public void renderJavaScriptReference(ResourceReference reference);
/**
* Writes a javascript reference, if the specified reference hasn't been rendered yet.
@@ -48,7 +48,7 @@ public interface IHeaderResponse extends
* id that will be used to filter duplicate reference (it's still filtered by URL
* too)
*/
- public void renderJavascriptReference(ResourceReference reference, String id);
+ public void renderJavaScriptReference(ResourceReference reference, String id);
/**
* Writes a javascript reference, if the specified reference hasn't been rendered yet.
@@ -56,7 +56,7 @@ public interface IHeaderResponse extends
* @param url
* context-relative url of the the javascript resource
*/
- public void renderJavascriptReference(String url);
+ public void renderJavaScriptReference(String url);
/**
* Writes a javascript reference, if the specified reference hasn't been rendered yet.
@@ -67,8 +67,7 @@ public interface IHeaderResponse extends
* id that will be used to filter duplicate reference (it's still filtered by URL
* too)
*/
- public void renderJavascriptReference(String url, String id);
-
+ public void renderJavaScriptReference(String url, String id);
/**
* Renders javascript code to the response, if the javascript has not already been rendered.
@@ -82,7 +81,7 @@ public interface IHeaderResponse extends
* unique id for the javascript element. This can be null, however in that case the
* ajax header contribution can't detect duplicate script fragments.
*/
- public void renderJavascript(CharSequence javascript, String id);
+ public void renderJavaScript(CharSequence javascript, String id);
/**
* Writes a CSS reference, if the specified reference hasn't been rendered yet.
@@ -146,9 +145,9 @@ public interface IHeaderResponse extends
/**
* Returns whether the given object has been marked as rendered.
* <ul>
- * <li>Methods <code>renderJavascriptReference</code> and <code>renderCSSReference</code> mark
+ * <li>Methods <code>renderJavaScriptReference</code> and <code>renderCSSReference</code> mark
* the specified {@link ResourceReference} as rendered.
- * <li>Method <code>renderJavascript</code> marks List of two elements (first is javascript body
+ * <li>Method <code>renderJavaScript</code> marks List of two elements (first is javascript body
* CharSequence and second is id) as rendered.
* <li>Method <code>renderString</code> marks the whole string as rendered.
* <li>Method <code>markRendered</code> can be used to mark an arbitrary object as rendered
@@ -176,14 +175,14 @@ public interface IHeaderResponse extends
*
* @param javascript
*/
- public void renderOnDomReadyJavascript(String javascript);
+ public void renderOnDomReadyJavaScript(String javascript);
/**
* Renders javascript that is executed after the entire page is loaded.
*
* @param javascript
*/
- public void renderOnLoadJavascript(String javascript);
+ public void renderOnLoadJavaScript(String javascript);
/**
* Renders javascript that is executed after the given event happens on specified target
@@ -192,7 +191,7 @@ public interface IHeaderResponse extends
* @param event
* @param javascript
*/
- public void renderOnEventJavascript(String target, String event, String javascript);
+ public void renderOnEventJavaScript(String target, String event, String javascript);
/**
* Mark Header rendering is completed and subsequent usage will be ignored. If some kind of
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractTextComponent.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractTextComponent.java?rev=1044667&r1=1044666&r2=1044667&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractTextComponent.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractTextComponent.java Sat Dec 11 15:15:21 2010
@@ -51,7 +51,7 @@ public abstract class AbstractTextCompon
/**
* Text components that implement this interface are know to be able to provide a pattern for
* formatting output and parsing input. This can be used by for instance date picker components
- * which are based on Javascript and need some knowledge as to how to communicate properly via
+ * which are based on JavaScript and need some knowledge as to how to communicate properly via
* request parameters.
*/
public static interface ITextFormatProvider
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java?rev=1044667&r1=1044666&r2=1044667&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java Sat Dec 11 15:15:21 2010
@@ -1892,8 +1892,8 @@ public class Form<T> extends WebMarkupCo
{
// register some metadata so we can later properly handle multipart ajax posts for
// embedded forms
- registerJavascriptNamespaces(response);
- response.renderJavascript("Wicket.Forms[\"" + getMarkupId() + "\"]={multipart:true};",
+ registerJavaScriptNamespaces(response);
+ response.renderJavaScript("Wicket.Forms[\"" + getMarkupId() + "\"]={multipart:true};",
Form.class.getName() + "." + getMarkupId() + ".metadata");
}
}
@@ -1903,9 +1903,9 @@ public class Form<T> extends WebMarkupCo
*
* @param response
*/
- protected void registerJavascriptNamespaces(IHeaderResponse response)
+ protected void registerJavaScriptNamespaces(IHeaderResponse response)
{
- response.renderJavascript(
+ response.renderJavaScript(
"if (typeof(Wicket)=='undefined') { Wicket={}; } if (typeof(Wicket.Forms)=='undefined') { Wicket.Forms={}; }",
Form.class.getName());
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/SubmitLink.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/SubmitLink.java?rev=1044667&r1=1044666&r2=1044667&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/SubmitLink.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/SubmitLink.java Sat Dec 11 15:15:21 2010
@@ -176,7 +176,7 @@ public class SubmitLink extends Abstract
*
* @return true if form's javascript onsubmit handler should be invoked, false otherwise
*/
- protected boolean shouldInvokeJavascriptFormOnsubmit()
+ protected boolean shouldInvokeJavaScriptFormOnsubmit()
{
return true;
}
@@ -201,7 +201,7 @@ public class SubmitLink extends Abstract
sb.append("var f=document.getElementById('");
sb.append(root.getMarkupId());
sb.append("');");
- if (shouldInvokeJavascriptFormOnsubmit())
+ if (shouldInvokeJavaScriptFormOnsubmit())
{
if (getForm() != root)
{
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=1044667&r1=1044666&r2=1044667&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 15:15:21 2010
@@ -16,6 +16,12 @@
*/
package org.apache.wicket.markup.html.form.upload;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.IHeaderContributor;
import org.apache.wicket.markup.html.IHeaderResponse;
@@ -35,12 +41,6 @@ import org.apache.wicket.util.convert.Co
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.upload.FileItem;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-
/**
* Form component that allows the user to select multiple files to upload via a single <input
@@ -145,7 +145,7 @@ public class MultiFileUploadField extend
* max number of files a user can upload
*
*/
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("unchecked")
public MultiFileUploadField(String id, IModel<? extends Collection<FileUpload>> model, int max)
{
super(id, (IModel<Collection<FileUpload>>)model);
@@ -208,8 +208,8 @@ public class MultiFileUploadField extend
public void renderHead(IHeaderResponse response)
{
// initialize the javascript library
- response.renderJavascriptReference(JS);
- response.renderOnDomReadyJavascript("new MultiSelector('" + getInputName() +
+ response.renderJavaScriptReference(JS);
+ response.renderOnDomReadyJavaScript("new MultiSelector('" + getInputName() +
"', document.getElementById('" + container.getMarkupId() + "'), " + max + ",'" +
getString("org.apache.wicket.mfu.delete") + "').addElement(document.getElementById('" +
upload.getMarkupId() + "'));");
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java?rev=1044667&r1=1044666&r2=1044667&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java Sat Dec 11 15:15:21 2010
@@ -72,7 +72,8 @@ public abstract class HeaderResponse imp
}
/**
- * @see org.apache.wicket.markup.html.IHeaderResponse#renderCSSReference(org.apache.wicket.request.resource.ResourceReference, String)
+ * @see org.apache.wicket.markup.html.IHeaderResponse#renderCSSReference(org.apache.wicket.request.resource.ResourceReference,
+ * String)
*/
public void renderCSSReference(ResourceReference reference, String media)
{
@@ -141,9 +142,9 @@ public abstract class HeaderResponse imp
/**
- * @see org.apache.wicket.markup.html.IHeaderResponse#renderJavascriptReference(org.apache.wicket.request.resource.ResourceReference)
+ * @see org.apache.wicket.markup.html.IHeaderResponse#renderJavaScriptReference(org.apache.wicket.request.resource.ResourceReference)
*/
- public void renderJavascriptReference(ResourceReference reference)
+ public void renderJavaScriptReference(ResourceReference reference)
{
if (reference == null)
{
@@ -153,14 +154,15 @@ public abstract class HeaderResponse imp
{
IRequestHandler handler = new ResourceReferenceRequestHandler(reference);
CharSequence url = RequestCycle.get().urlFor(handler);
- internalRenderJavascriptReference(url.toString(), null);
+ internalRenderJavaScriptReference(url.toString(), null);
}
}
/**
- * @see org.apache.wicket.markup.html.IHeaderResponse#renderJavascriptReference(org.apache.wicket.request.resource.ResourceReference, String)
+ * @see org.apache.wicket.markup.html.IHeaderResponse#renderJavaScriptReference(org.apache.wicket.request.resource.ResourceReference,
+ * String)
*/
- public void renderJavascriptReference(ResourceReference reference, String id)
+ public void renderJavaScriptReference(ResourceReference reference, String id)
{
if (reference == null)
{
@@ -170,28 +172,28 @@ public abstract class HeaderResponse imp
{
IRequestHandler handler = new ResourceReferenceRequestHandler(reference);
CharSequence url = RequestCycle.get().urlFor(handler);
- internalRenderJavascriptReference(url.toString(), id);
+ internalRenderJavaScriptReference(url.toString(), id);
}
}
/**
- * @see org.apache.wicket.markup.html.IHeaderResponse#renderJavascriptReference(java.lang.String)
+ * @see org.apache.wicket.markup.html.IHeaderResponse#renderJavaScriptReference(java.lang.String)
*/
- public void renderJavascriptReference(String url)
+ public void renderJavaScriptReference(String url)
{
- internalRenderJavascriptReference(relative(url), null);
+ internalRenderJavaScriptReference(relative(url), null);
}
/**
- * @see org.apache.wicket.markup.html.IHeaderResponse#renderJavascriptReference(java.lang.String,
+ * @see org.apache.wicket.markup.html.IHeaderResponse#renderJavaScriptReference(java.lang.String,
* java.lang.String)
*/
- public void renderJavascriptReference(String url, String id)
+ public void renderJavaScriptReference(String url, String id)
{
- internalRenderJavascriptReference(relative(url), id);
+ internalRenderJavaScriptReference(relative(url), id);
}
- private void internalRenderJavascriptReference(String url, String id)
+ private void internalRenderJavaScriptReference(String url, String id)
{
if (Strings.isEmpty(url))
{
@@ -207,7 +209,7 @@ public abstract class HeaderResponse imp
if (token1Unused && token2Unused)
{
- JavaScriptUtils.writeJavascriptUrl(getResponse(), url, id);
+ JavaScriptUtils.writeJavaScriptUrl(getResponse(), url, id);
markRendered(token1);
if (token2 != null)
{
@@ -218,10 +220,10 @@ public abstract class HeaderResponse imp
}
/**
- * @see org.apache.wicket.markup.html.IHeaderResponse#renderJavascript(java.lang.CharSequence,
+ * @see org.apache.wicket.markup.html.IHeaderResponse#renderJavaScript(java.lang.CharSequence,
* java.lang.String)
*/
- public void renderJavascript(CharSequence javascript, String id)
+ public void renderJavaScript(CharSequence javascript, String id)
{
if (javascript == null)
{
@@ -232,7 +234,7 @@ public abstract class HeaderResponse imp
List<String> token = Arrays.asList(javascript.toString(), id);
if (wasRendered(token) == false)
{
- JavaScriptUtils.writeJavascript(getResponse(), javascript, id);
+ JavaScriptUtils.writeJavaScript(getResponse(), javascript, id);
markRendered(token);
}
}
@@ -267,9 +269,9 @@ public abstract class HeaderResponse imp
}
/**
- * @see org.apache.wicket.markup.html.IHeaderResponse#renderOnDomReadyJavascript(java.lang.String)
+ * @see org.apache.wicket.markup.html.IHeaderResponse#renderOnDomReadyJavaScript(java.lang.String)
*/
- public void renderOnDomReadyJavascript(String javascript)
+ public void renderOnDomReadyJavaScript(String javascript)
{
if (javascript == null)
{
@@ -277,14 +279,14 @@ public abstract class HeaderResponse imp
}
if (!closed)
{
- renderOnEventJavascript("window", "domready", javascript);
+ renderOnEventJavaScript("window", "domready", javascript);
}
}
/**
- * @see org.apache.wicket.markup.html.IHeaderResponse#renderOnLoadJavascript(java.lang.String)
+ * @see org.apache.wicket.markup.html.IHeaderResponse#renderOnLoadJavaScript(java.lang.String)
*/
- public void renderOnLoadJavascript(String javascript)
+ public void renderOnLoadJavaScript(String javascript)
{
if (javascript == null)
{
@@ -292,24 +294,24 @@ public abstract class HeaderResponse imp
}
if (!closed)
{
- renderOnEventJavascript("window", "load", javascript);
+ renderOnEventJavaScript("window", "load", javascript);
}
}
/**
*
- * @see org.apache.wicket.markup.html.IHeaderResponse#renderOnEventJavascript(java.lang.String,
+ * @see org.apache.wicket.markup.html.IHeaderResponse#renderOnEventJavaScript(java.lang.String,
* java.lang.String, java.lang.String)
*/
- public void renderOnEventJavascript(String target, String event, String javascript)
+ public void renderOnEventJavaScript(String target, String event, String javascript)
{
if (!closed)
{
List<String> token = Arrays.asList("javascript-event", target, event, javascript);
if (wasRendered(token) == false)
{
- renderJavascriptReference(WicketEventReference.INSTANCE);
- JavaScriptUtils.writeJavascript(getResponse(), "Wicket.Event.add(" + target +
+ renderJavaScriptReference(WicketEventReference.INSTANCE);
+ JavaScriptUtils.writeJavaScript(getResponse(), "Wicket.Event.add(" + target +
", \"" + event + "\", function(event) { " + javascript + ";});");
markRendered(token);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java?rev=1044667&r1=1044666&r2=1044667&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java Sat Dec 11 15:15:21 2010
@@ -64,7 +64,7 @@ public class BrowserInfoPage extends Web
/**
* Bookmarkable constructor. This is not for normal framework client use. It will be called
- * whenever Javascript is not supported, and the browser info page's meta refresh fires to this
+ * whenever JavaScript is not supported, and the browser info page's meta refresh fires to this
* page. Prior to this, the other constructor should already have been called.
*
* @param parameters
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=1044667&r1=1044666&r2=1044667&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 15:15:21 2010
@@ -828,11 +828,11 @@ public abstract class AbstractTree exten
// its current children is in the event's list of children
boolean wasLeaf = true;
int nodeChildCount = getChildCount(parentNode);
- for (int i = 0; wasLeaf && i < nodeChildCount; i++)
+ for (int i = 0; wasLeaf && i < nodeChildCount; i++)
{
wasLeaf = eventChildren.contains(getChildAt(parentNode, i));
}
-
+
if (wasLeaf)
{
// parentNode now has children for the first time, so we need to invalidate
@@ -992,10 +992,10 @@ public abstract class AbstractTree exten
// remove DOM elements that need to be removed
if (deleteIds.length() != 0)
{
- String js = getElementsDeleteJavascript();
+ String js = getElementsDeleteJavaScript();
// add the javascript to target
- target.prependJavascript(js);
+ target.prependJavaScript(js);
}
// We have to repeat this as long as there are any dirty items to be
@@ -1035,7 +1035,7 @@ public abstract class AbstractTree exten
{
// it's already in dom, so we can use it as point of
// insertion
- target.prependJavascript("Wicket.Tree.createElement(\"" +
+ target.prependJavaScript("Wicket.Tree.createElement(\"" +
item.getMarkupId() + "\"," + "\"" + previous.getMarkupId() + "\")");
// remove the item so we don't process it again
@@ -1248,7 +1248,7 @@ public abstract class AbstractTree exten
*
* @return The javascript
*/
- private String getElementsDeleteJavascript()
+ private String getElementsDeleteJavaScript()
{
// build the javascript call
final AppendingStringBuffer buffer = new AppendingStringBuffer(100);
@@ -1692,6 +1692,6 @@ public abstract class AbstractTree exten
@Override
public void renderHead(IHeaderResponse response)
{
- response.renderJavascriptReference(JAVASCRIPT);
+ response.renderJavaScriptReference(JAVASCRIPT);
}
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/ResourceUtil.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/ResourceUtil.java?rev=1044667&r1=1044666&r2=1044667&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/ResourceUtil.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/ResourceUtil.java Sat Dec 11 15:15:21 2010
@@ -72,18 +72,18 @@ public class ResourceUtil
{
if (Strings.isEmpty(string))
{
- resp.renderJavascriptReference(ref);
+ resp.renderJavaScriptReference(ref);
}
else
{
- resp.renderJavascriptReference(ref, string);
+ resp.renderJavaScriptReference(ref, string);
}
}
}
/**
* read string with platform default encoding from resource stream
- *
+ *
* @see #readString(org.apache.wicket.util.resource.IResourceStream, java.nio.charset.Charset)
*/
public static String readString(IResourceStream resourceStream)
@@ -93,9 +93,11 @@ public class ResourceUtil
/**
* read string with specified encoding from resource stream
- *
- * @param resourceStream string source
- * @param charset charset for the string encoding (use <code>null</code> for platform default)
+ *
+ * @param resourceStream
+ * string source
+ * @param charset
+ * charset for the string encoding (use <code>null</code> for platform default)
* @return string read from resource stream
*/
public static String readString(IResourceStream resourceStream, Charset charset)
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/aggregation/AbstractResourceAggregatingHeaderResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/aggregation/AbstractResourceAggregatingHeaderResponse.java?rev=1044667&r1=1044666&r2=1044667&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/aggregation/AbstractResourceAggregatingHeaderResponse.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/aggregation/AbstractResourceAggregatingHeaderResponse.java Sat Dec 11 15:15:21 2010
@@ -72,13 +72,13 @@ public abstract class AbstractResourceAg
}
@Override
- public void renderJavascriptReference(ResourceReference reference)
+ public void renderJavaScriptReference(ResourceReference reference)
{
topLevelReferences.add(new ResourceReferenceAndStringData(reference, null, false));
}
@Override
- public void renderJavascriptReference(ResourceReference reference, String id)
+ public void renderJavaScriptReference(ResourceReference reference, String id)
{
topLevelReferences.add(new ResourceReferenceAndStringData(reference, id, false));
}
@@ -186,7 +186,7 @@ public abstract class AbstractResourceAg
*
* For instance, if you want to aggregate your groups into a single HTTP request, you can
* override this method, create the URL to your aggregation servlet (or {@link Resource}), and
- * then call <tt>getRealResponse().renderJavascriptReference(yourUrl)</tt>, or the appropriate
+ * then call <tt>getRealResponse().renderJavaScriptReference(yourUrl)</tt>, or the appropriate
* method to render the URL for a group of CSS references.
*
* @param alreadyRendered
@@ -247,7 +247,7 @@ public abstract class AbstractResourceAg
* rendered only a YUI constructor that loaded all the JS files for each group. Then, you need
* to loop through the references again, and render any JS inside a sandboxed YUI.use()
* statement. You would render those here by creating the YUI.use statement, and call
- * <tt>getHeaderResponse().renderJavascript(yourJS, null)</tt>
+ * <tt>getHeaderResponse().renderJavaScript(yourJS, null)</tt>
*
* @param allTopLevelReferences
* all the references that were rendered by the developers
@@ -260,17 +260,17 @@ public abstract class AbstractResourceAg
/* other interface methods: */
@Override
- public void renderJavascriptReference(String url)
+ public void renderJavaScriptReference(String url)
{
// TODO: can we aggregate this? probably shouldn't...
- getRealResponse().renderJavascriptReference(url);
+ getRealResponse().renderJavaScriptReference(url);
}
@Override
- public void renderJavascriptReference(String url, String id)
+ public void renderJavaScriptReference(String url, String id)
{
// TODO: can we aggregate this? probably shouldn't...
- getRealResponse().renderJavascriptReference(url, id);
+ getRealResponse().renderJavaScriptReference(url, id);
}
@Override
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/dependencies/AbstractResourceDependentResourceReference.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/dependencies/AbstractResourceDependentResourceReference.java?rev=1044667&r1=1044666&r2=1044667&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/dependencies/AbstractResourceDependentResourceReference.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/dependencies/AbstractResourceDependentResourceReference.java Sat Dec 11 15:15:21 2010
@@ -43,7 +43,7 @@ public abstract class AbstractResourceDe
*/
public enum ResourceType {
/**
- * Javascript reference
+ * JavaScript reference
*/
JS,
@@ -94,7 +94,7 @@ public abstract class AbstractResourceDe
/**
* A globally-unique (to your application(s)) ID for this resource reference. This is optional,
- * and is set for you if you call IHeaderResponse.renderJavascriptReference(yourReference,
+ * and is set for you if you call IHeaderResponse.renderJavaScriptReference(yourReference,
* "some-id").
*
* @param uniqueId
@@ -106,7 +106,7 @@ public abstract class AbstractResourceDe
/**
* A globally-unique (to your application(s)) ID for this resource reference. This is optional,
- * and is set for you if you call IHeaderResponse.renderJavascriptReference(yourReference,
+ * and is set for you if you call IHeaderResponse.renderJavaScriptReference(yourReference,
* "some-id").
*
* @return globally-unique (to your application(s)) ID for this resource reference
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/dependencies/ResourceReferenceDependencyInjectingHeaderResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/dependencies/ResourceReferenceDependencyInjectingHeaderResponse.java?rev=1044667&r1=1044666&r2=1044667&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/dependencies/ResourceReferenceDependencyInjectingHeaderResponse.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/dependencies/ResourceReferenceDependencyInjectingHeaderResponse.java Sat Dec 11 15:15:21 2010
@@ -35,7 +35,6 @@ import org.apache.wicket.resource.depend
*/
public class ResourceReferenceDependencyInjectingHeaderResponse extends DecoratingHeaderResponse
{
-
private final IResourceReferenceDependencyConfigurationService configurationService;
/**
@@ -97,13 +96,13 @@ public class ResourceReferenceDependency
}
@Override
- public void renderJavascriptReference(ResourceReference reference)
+ public void renderJavaScriptReference(ResourceReference reference)
{
render(get(reference));
}
@Override
- public void renderJavascriptReference(ResourceReference reference, String id)
+ public void renderJavaScriptReference(ResourceReference reference, String id)
{
AbstractResourceDependentResourceReference parent = get(reference);
parent.setUniqueId(id);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/AbstractHeaderResponseFilter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/AbstractHeaderResponseFilter.java?rev=1044667&r1=1044666&r2=1044667&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/AbstractHeaderResponseFilter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/AbstractHeaderResponseFilter.java Sat Dec 11 15:15:21 2010
@@ -52,7 +52,7 @@ public abstract class AbstractHeaderResp
return true;
}
- public boolean acceptOtherJavascript()
+ public boolean acceptOtherJavaScript()
{
return true;
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/CssAcceptingHeaderResponseFilter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/CssAcceptingHeaderResponseFilter.java?rev=1044667&r1=1044666&r2=1044667&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/CssAcceptingHeaderResponseFilter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/CssAcceptingHeaderResponseFilter.java Sat Dec 11 15:15:21 2010
@@ -24,7 +24,7 @@ import org.apache.wicket.util.string.Str
/**
* This filter accepts anything that appears to be CSS. All CSS that is not a resource reference (
* {@link #acceptOtherCss()}) is accepted. All JS that is not a resource reference (
- * {@link #acceptOtherJavascript()}) is not accepted.
+ * {@link #acceptOtherJavaScript()}) is not accepted.
*
* The references are accepted if they appear to be CSS. If the reference passed in is an instance
* of {@link AbstractResourceDependentResourceReference}, we use the {@link ResourceType} from it to
@@ -62,7 +62,7 @@ public class CssAcceptingHeaderResponseF
}
@Override
- public boolean acceptOtherJavascript()
+ public boolean acceptOtherJavaScript()
{
return false;
}