Author: jdonnerstag
Date: Sat Dec 11 13:57:56 2010
New Revision: 1044658
URL: http://svn.apache.org/viewvc?rev=1044658&view=rev
Log:
rename classes and methods from *JavaScript* to *Javascript*
Issue: WICKET-715
Added:
wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityJavaScriptContributor.java
- copied, changed from r1044652,
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/VelocityJavaScriptContributorTest.java
- copied, changed from r1044652,
wicket/trunk/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavascriptContributorTest.java
wicket/trunk/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavaScriptPage.java
- copied, changed from r1044652,
wicket/trunk/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavascriptPage.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/javascript/NoOpJavaScriptCompressor.java
- copied, changed from r1044652,
wicket/trunk/wicket/src/main/java/org/apache/wicket/javascript/NoOpJavascriptCompressor.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/JavaScriptAcceptingHeaderResponseFilter.java
- copied, changed from r1044652,
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/JavascriptAcceptingHeaderResponseFilter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/JavaScriptFilteredIntoFooterHeaderResponse.java
- copied, changed from r1044652,
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/JavascriptFilteredIntoFooterHeaderResponse.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/JavaScriptStripper.java
- copied, changed from r1044652,
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/JavascriptStripper.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/JavaScriptUtils.java
- copied, changed from r1044652,
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/JavascriptUtils.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/string/JavaScriptStripperTest.java
- copied, changed from r1044652,
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/string/JavascriptStripperTest.java
Removed:
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/VelocityJavascriptContributorTest.java
wicket/trunk/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavascriptPage.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/javascript/NoOpJavascriptCompressor.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/JavascriptAcceptingHeaderResponseFilter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/JavascriptFilteredIntoFooterHeaderResponse.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/JavascriptStripper.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/JavascriptUtils.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/string/JavascriptStripperTest.java
Modified:
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ServerHostNameAndTimeFilter.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/markup/html/form/palette/component/AbstractOptions.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/OnChangeAjaxBehavior.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/javascript/DefaultJavaScriptCompressor.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/HeaderResponseContainerFilteringHeaderResponse.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/response/filter/AjaxServerAndClientTimeFilter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/response/filter/ServerAndClientTimeFilter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/JavaScriptTemplate.java
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=1044658&r1=1044657&r2=1044658&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 13:57:56 2010
@@ -27,7 +27,7 @@ import org.apache.wicket.extensions.yui.
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.markup.html.WebComponent;
import org.apache.wicket.request.resource.PackageResourceReference;
-import org.apache.wicket.util.string.JavascriptUtils;
+import org.apache.wicket.util.string.JavaScriptUtils;
/**
@@ -192,7 +192,7 @@ public abstract class AbstractCalendar e
String javascriptId = getJavascriptId();
String javascriptWidgetId = getJavascriptWidgetId();
StringBuilder b = new StringBuilder();
- b.append(JavascriptUtils.SCRIPT_OPEN_TAG);
+ b.append(JavaScriptUtils.SCRIPT_OPEN_TAG);
// initialize wicket namespace and register the init function
// for the YUI widget
b.append("YAHOO.namespace(\"wicket\");\nfunction init");
@@ -267,7 +267,7 @@ public abstract class AbstractCalendar e
b.append("YAHOO.util.Event.addListener(window, \"load\", init");
b.append(javascriptId);
b.append(");");
- b.append(JavascriptUtils.SCRIPT_CLOSE_TAG);
+ b.append(JavaScriptUtils.SCRIPT_CLOSE_TAG);
response.renderString(b);
}
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ServerHostNameAndTimeFilter.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ServerHostNameAndTimeFilter.java?rev=1044658&r1=1044657&r2=1044658&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ServerHostNameAndTimeFilter.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ServerHostNameAndTimeFilter.java
Sat Dec 11 13:57:56 2010
@@ -22,7 +22,7 @@ import java.net.UnknownHostException;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.response.filter.IResponseFilter;
import org.apache.wicket.util.string.AppendingStringBuffer;
-import org.apache.wicket.util.string.JavascriptUtils;
+import org.apache.wicket.util.string.JavaScriptUtils;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.time.Duration;
@@ -88,14 +88,14 @@ public class ServerHostNameAndTimeFilter
{
AppendingStringBuffer script = new
AppendingStringBuffer(75);
script.append("\n");
- script.append(JavascriptUtils.SCRIPT_OPEN_TAG);
+ script.append(JavaScriptUtils.SCRIPT_OPEN_TAG);
script.append("\n\twindow.defaultStatus='");
script.append("Host: ");
script.append(host);
script.append(", handled in: ");
script.append(Duration.milliseconds(timeTaken));
script.append("';\n");
- script.append(JavascriptUtils.SCRIPT_CLOSE_TAG);
+ script.append(JavaScriptUtils.SCRIPT_CLOSE_TAG);
script.append("\n");
responseBuffer.insert(index + 6, script);
}
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=1044658&r1=1044657&r2=1044658&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 13:57:56 2010
@@ -32,7 +32,7 @@ import org.apache.wicket.markup.html.pan
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.util.convert.IConverter;
-import org.apache.wicket.util.string.JavascriptUtils;
+import org.apache.wicket.util.string.JavaScriptUtils;
import org.apache.wicket.validation.IValidator;
@@ -457,7 +457,7 @@ public class AjaxEditableLabel<T> extend
if (errorMessage instanceof String)
{
target.appendJavascript("window.status='" +
-
JavascriptUtils.escapeQuotes((String)errorMessage) + "';");
+
JavaScriptUtils.escapeQuotes((String)errorMessage) + "';");
}
target.appendJavascript("{var el=wicketGet('" +
editor.getMarkupId() +
"'); el.select(); el.focus();}");
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java?rev=1044658&r1=1044657&r2=1044658&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java
Sat Dec 11 13:57:56 2010
@@ -26,7 +26,7 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.markup.html.form.IChoiceRenderer;
import org.apache.wicket.util.convert.IConverter;
import org.apache.wicket.util.string.AppendingStringBuffer;
-import org.apache.wicket.util.string.JavascriptUtils;
+import org.apache.wicket.util.string.JavaScriptUtils;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.value.IValueMap;
@@ -171,10 +171,10 @@ public abstract class AbstractOptions<T>
protected void avoidAjaxSerialization()
{
getResponse().write(
- JavascriptUtils.SCRIPT_OPEN_TAG +
+ JavaScriptUtils.SCRIPT_OPEN_TAG +
"if (typeof(Wicket) != \"undefined\" &&
typeof(Wicket.Form) != \"undefined\")" +
" Wicket.Form.excludeFromAjaxSerialization."
+ getMarkupId() + "='true';" +
- JavascriptUtils.SCRIPT_CLOSE_TAG);
+ JavaScriptUtils.SCRIPT_CLOSE_TAG);
}
/**
Copied:
wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityJavaScriptContributor.java
(from r1044652,
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?p2=wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityJavaScriptContributor.java&p1=wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityJavascriptContributor.java&r1=1044652&r2=1044658&rev=1044658&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 13:57:56 2010
@@ -28,7 +28,7 @@ import org.apache.wicket.util.lang.Packa
* A derivation of VelocityContributor that uses
* {...@link
org.apache.wicket.markup.html.IHeaderResponse#renderJavascript(CharSequence,
String)}
*/
-public class VelocityJavascriptContributor extends VelocityContributor
+public class VelocityJavaScriptContributor extends VelocityContributor
{
private static final long serialVersionUID = 1L;
@@ -43,7 +43,7 @@ public class VelocityJavascriptContribut
* @param model
* @param id
*/
- public VelocityJavascriptContributor(Class<?> clazz, String
templatePath,
+ public VelocityJavaScriptContributor(Class<?> clazz, String
templatePath,
IModel<? extends Map<?, ?>> model, String id)
{
super(Packages.absolutePath(clazz, templatePath), model);
@@ -58,7 +58,7 @@ public class VelocityJavascriptContribut
* @param model
* @param id
*/
- public VelocityJavascriptContributor(String templatePath, IModel<?
extends Map<?, ?>> model,
+ public VelocityJavaScriptContributor(String templatePath, IModel<?
extends Map<?, ?>> model,
String id)
{
super(templatePath, model);
Copied:
wicket/trunk/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavaScriptContributorTest.java
(from r1044652,
wicket/trunk/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavascriptContributorTest.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavaScriptContributorTest.java?p2=wicket/trunk/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavaScriptContributorTest.java&p1=wicket/trunk/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavascriptContributorTest.java&r1=1044652&r2=1044658&rev=1044658&view=diff
==============================================================================
---
wicket/trunk/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavascriptContributorTest.java
(original)
+++
wicket/trunk/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavaScriptContributorTest.java
Sat Dec 11 13:57:56 2010
@@ -23,7 +23,7 @@ import org.apache.wicket.util.tester.Wic
/**
* Test header contributions.
*/
-public class VelocityJavascriptContributorTest extends TestCase
+public class VelocityJavaScriptContributorTest extends TestCase
{
/**
* Test that the header contribution is added correctly.
@@ -31,9 +31,9 @@ public class VelocityJavascriptContribut
public void testRenderHead()
{
WicketTester tester = new WicketTester();
- tester.startPage(VelocityJavascriptPage.class);
+ tester.startPage(VelocityJavaScriptPage.class);
System.out.println(tester.getLastResponseAsString());
- tester.assertContains("msg1: " + VelocityJavascriptPage.MSG1);
+ tester.assertContains("msg1: " + VelocityJavaScriptPage.MSG1);
tester.dumpPage();
tester.destroy();
}
Copied:
wicket/trunk/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavaScriptPage.java
(from r1044652,
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?p2=wicket/trunk/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavaScriptPage.java&p1=wicket/trunk/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavascriptPage.java&r1=1044652&r2=1044658&rev=1044658&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 13:57:56 2010
@@ -21,26 +21,26 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.collections.MiniMap;
import org.apache.wicket.util.lang.Packages;
-import org.apache.wicket.util.string.JavascriptUtils;
-import org.apache.wicket.velocity.VelocityJavascriptContributor;
+import org.apache.wicket.util.string.JavaScriptUtils;
+import org.apache.wicket.velocity.VelocityJavaScriptContributor;
/**
* Test page.
*/
-public class VelocityJavascriptPage extends WebPage
+public class VelocityJavaScriptPage extends WebPage
{
static final String MSG1 = "Stoopid test 1";
/**
* Construct.
*/
- public VelocityJavascriptPage()
+ public VelocityJavaScriptPage()
{
String templateName = Packages.absolutePath(getClass(),
"testTemplate.vm");
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>>()
{
@@ -57,6 +57,6 @@ public class VelocityJavascriptPage exte
};
- add(new VelocityJavascriptContributor(templateName, model, id));
+ add(new VelocityJavaScriptContributor(templateName, model, id));
}
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/OnChangeAjaxBehavior.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/OnChangeAjaxBehavior.java?rev=1044658&r1=1044657&r2=1044658&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/OnChangeAjaxBehavior.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/OnChangeAjaxBehavior.java
Sat Dec 11 13:57:56 2010
@@ -19,7 +19,7 @@ package org.apache.wicket.ajax.form;
import org.apache.wicket.markup.html.form.AbstractTextComponent;
import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.wicket.request.Response;
-import org.apache.wicket.util.string.JavascriptUtils;
+import org.apache.wicket.util.string.JavaScriptUtils;
/**
* A behavior that updates the hosting {...@link FormComponent} via ajax when
value of the component is
@@ -54,9 +54,9 @@ public abstract class OnChangeAjaxBehavi
{
Response response = getComponent().getResponse();
final String id = getComponent().getMarkupId();
- response.write(JavascriptUtils.SCRIPT_OPEN_TAG);
+ response.write(JavaScriptUtils.SCRIPT_OPEN_TAG);
response.write("new Wicket.ChangeHandler('" + id +
"');");
- response.write(JavascriptUtils.SCRIPT_CLOSE_TAG);
+ response.write(JavaScriptUtils.SCRIPT_CLOSE_TAG);
}
}
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/javascript/DefaultJavaScriptCompressor.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/javascript/DefaultJavaScriptCompressor.java?rev=1044658&r1=1044657&r2=1044658&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/javascript/DefaultJavaScriptCompressor.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/javascript/DefaultJavaScriptCompressor.java
Sat Dec 11 13:57:56 2010
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.javascript;
-import org.apache.wicket.util.string.JavascriptStripper;
+import org.apache.wicket.util.string.JavaScriptStripper;
/**
* Wicket default implementation of a javascript compressor
@@ -30,6 +30,6 @@ public class DefaultJavaScriptCompressor
*/
public String compress(String original)
{
- return new
JavascriptStripper().stripCommentsAndWhitespace(original);
+ return new
JavaScriptStripper().stripCommentsAndWhitespace(original);
}
}
Copied:
wicket/trunk/wicket/src/main/java/org/apache/wicket/javascript/NoOpJavaScriptCompressor.java
(from r1044652,
wicket/trunk/wicket/src/main/java/org/apache/wicket/javascript/NoOpJavascriptCompressor.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/javascript/NoOpJavaScriptCompressor.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/javascript/NoOpJavaScriptCompressor.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/javascript/NoOpJavascriptCompressor.java&r1=1044652&r2=1044658&rev=1044658&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/javascript/NoOpJavascriptCompressor.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/javascript/NoOpJavaScriptCompressor.java
Sat Dec 11 13:57:56 2010
@@ -21,7 +21,7 @@ package org.apache.wicket.javascript;
*
* @author Juergen Donnerstag
*/
-public class NoOpJavascriptCompressor implements IJavaScriptCompressor
+public class NoOpJavaScriptCompressor implements IJavaScriptCompressor
{
/**
* @see
org.apache.wicket.javascript.IJavaScriptCompressor#compress(java.lang.String)
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=1044658&r1=1044657&r2=1044658&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 13:57:56 2010
@@ -30,7 +30,7 @@ import org.apache.wicket.request.cycle.R
import
org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.response.NullResponse;
-import org.apache.wicket.util.string.JavascriptUtils;
+import org.apache.wicket.util.string.JavaScriptUtils;
import org.apache.wicket.util.string.Strings;
@@ -207,7 +207,7 @@ public abstract class HeaderResponse imp
if (token1Unused && token2Unused)
{
-
JavascriptUtils.writeJavascriptUrl(getResponse(), url, id);
+
JavaScriptUtils.writeJavascriptUrl(getResponse(), url, id);
markRendered(token1);
if (token2 != null)
{
@@ -232,7 +232,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);
}
}
@@ -309,7 +309,7 @@ public abstract class HeaderResponse imp
if (wasRendered(token) == false)
{
renderJavascriptReference(WicketEventReference.INSTANCE);
- JavascriptUtils.writeJavascript(getResponse(),
"Wicket.Event.add(" + target +
+ JavaScriptUtils.writeJavascript(getResponse(),
"Wicket.Event.add(" + target +
", \"" + event + "\", function(event) {
" + javascript + ";});");
markRendered(token);
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/HeaderResponseContainerFilteringHeaderResponse.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/HeaderResponseContainerFilteringHeaderResponse.java?rev=1044658&r1=1044657&r2=1044658&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/HeaderResponseContainerFilteringHeaderResponse.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/HeaderResponseContainerFilteringHeaderResponse.java
Sat Dec 11 13:57:56 2010
@@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory;
*
* @see HeaderResponseFilteredResponseContainer
* @see CssAcceptingHeaderResponseFilter
- * @see JavascriptAcceptingHeaderResponseFilter
+ * @see JavaScriptAcceptingHeaderResponseFilter
* @author Jeremy Thomerson
*/
public class HeaderResponseContainerFilteringHeaderResponse extends
DecoratingHeaderResponse
Copied:
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/JavaScriptAcceptingHeaderResponseFilter.java
(from r1044652,
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/JavascriptAcceptingHeaderResponseFilter.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/JavaScriptAcceptingHeaderResponseFilter.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/JavaScriptAcceptingHeaderResponseFilter.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/JavascriptAcceptingHeaderResponseFilter.java&r1=1044652&r2=1044658&rev=1044658&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/JavascriptAcceptingHeaderResponseFilter.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/JavaScriptAcceptingHeaderResponseFilter.java
Sat Dec 11 13:57:56 2010
@@ -22,16 +22,15 @@ package org.apache.wicket.resource.filte
* @see CssAcceptingHeaderResponseFilter
* @author Jeremy Thomerson
*/
-public class JavascriptAcceptingHeaderResponseFilter extends
OppositeHeaderResponseFilter
+public class JavaScriptAcceptingHeaderResponseFilter extends
OppositeHeaderResponseFilter
{
-
/**
* Construct.
*
* @param name
* name of the filter (used by the container that renders
these resources)
*/
- public JavascriptAcceptingHeaderResponseFilter(String name)
+ public JavaScriptAcceptingHeaderResponseFilter(String name)
{
super(name, new CssAcceptingHeaderResponseFilter("NOT_USED"));
}
Copied:
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/JavaScriptFilteredIntoFooterHeaderResponse.java
(from r1044652,
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/JavascriptFilteredIntoFooterHeaderResponse.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/JavaScriptFilteredIntoFooterHeaderResponse.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/JavaScriptFilteredIntoFooterHeaderResponse.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/JavascriptFilteredIntoFooterHeaderResponse.java&r1=1044652&r2=1044658&rev=1044658&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/JavascriptFilteredIntoFooterHeaderResponse.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/filtering/JavaScriptFilteredIntoFooterHeaderResponse.java
Sat Dec 11 13:57:56 2010
@@ -26,10 +26,9 @@ import org.apache.wicket.markup.html.IHe
*
* @author Jeremy Thomerson
*/
-public final class JavascriptFilteredIntoFooterHeaderResponse extends
+public final class JavaScriptFilteredIntoFooterHeaderResponse extends
HeaderResponseContainerFilteringHeaderResponse
{
-
private static final String HEADER_FILTER_NAME = "headerBucket";
/**
@@ -41,7 +40,7 @@ public final class JavascriptFilteredInt
* the name of the bucket that you will use for your footer
container (see the class
* javadocs for a reminder about putting this container in
your footer)
*/
- public JavascriptFilteredIntoFooterHeaderResponse(IHeaderResponse
response,
+ public JavaScriptFilteredIntoFooterHeaderResponse(IHeaderResponse
response,
String footerBucketName)
{
super(response, HEADER_FILTER_NAME, null);
@@ -55,9 +54,9 @@ public final class JavascriptFilteredInt
return new IHeaderResponseFilter[] { header, footer };
}
- protected JavascriptAcceptingHeaderResponseFilter
createFooterFilter(String footerBucketName)
+ protected JavaScriptAcceptingHeaderResponseFilter
createFooterFilter(String footerBucketName)
{
- return new
JavascriptAcceptingHeaderResponseFilter(footerBucketName);
+ return new
JavaScriptAcceptingHeaderResponseFilter(footerBucketName);
}
protected CssAcceptingHeaderResponseFilter createHeaderFilter(String
headerFilterName)
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/response/filter/AjaxServerAndClientTimeFilter.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/response/filter/AjaxServerAndClientTimeFilter.java?rev=1044658&r1=1044657&r2=1044658&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/response/filter/AjaxServerAndClientTimeFilter.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/response/filter/AjaxServerAndClientTimeFilter.java
Sat Dec 11 13:57:56 2010
@@ -22,7 +22,7 @@ import java.util.Map;
import org.apache.wicket.Application;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.util.string.AppendingStringBuffer;
-import org.apache.wicket.util.string.JavascriptUtils;
+import org.apache.wicket.util.string.JavaScriptUtils;
import org.apache.wicket.util.string.interpolator.MapVariableInterpolator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -56,14 +56,14 @@ public class AjaxServerAndClientTimeFilt
if (headIndex != -1 && bodyIndex != -1)
{
AppendingStringBuffer endScript = new
AppendingStringBuffer(150);
-
endScript.append("\n").append(JavascriptUtils.SCRIPT_OPEN_TAG);
+
endScript.append("\n").append(JavaScriptUtils.SCRIPT_OPEN_TAG);
endScript.append("\nwindow.defaultStatus='");
endScript.append(getStatusString(timeTaken,
"ServerAndClientTimeFilter.statustext"));
-
endScript.append("';\n").append(JavascriptUtils.SCRIPT_CLOSE_TAG).append("\n");
+
endScript.append("';\n").append(JavaScriptUtils.SCRIPT_CLOSE_TAG).append("\n");
responseBuffer.insert(bodyIndex - 1, endScript);
- responseBuffer.insert(headIndex + 6, "\n" +
JavascriptUtils.SCRIPT_OPEN_TAG +
+ responseBuffer.insert(headIndex + 6, "\n" +
JavaScriptUtils.SCRIPT_OPEN_TAG +
"\nvar clientTimeVariable = new
Date().getTime();\n" +
- JavascriptUtils.SCRIPT_CLOSE_TAG + "\n");
+ JavaScriptUtils.SCRIPT_CLOSE_TAG + "\n");
}
else if (ajaxStart != -1 && ajaxEnd != -1)
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/response/filter/ServerAndClientTimeFilter.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/response/filter/ServerAndClientTimeFilter.java?rev=1044658&r1=1044657&r2=1044658&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/response/filter/ServerAndClientTimeFilter.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/response/filter/ServerAndClientTimeFilter.java
Sat Dec 11 13:57:56 2010
@@ -23,7 +23,7 @@ import org.apache.wicket.Application;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.util.string.AppendingStringBuffer;
-import org.apache.wicket.util.string.JavascriptUtils;
+import org.apache.wicket.util.string.JavaScriptUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -68,14 +68,14 @@ public class ServerAndClientTimeFilter i
.getString("ServerAndClientTimeFilter.statustext", null, Model.ofMap(map),
defaultValue.toString());
AppendingStringBuffer endScript = new
AppendingStringBuffer(150);
-
endScript.append("\n").append(JavascriptUtils.SCRIPT_OPEN_TAG);
+
endScript.append("\n").append(JavaScriptUtils.SCRIPT_OPEN_TAG);
endScript.append("\nwindow.defaultStatus='");
endScript.append(txt);
-
endScript.append("';\n").append(JavascriptUtils.SCRIPT_CLOSE_TAG).append("\n");
+
endScript.append("';\n").append(JavaScriptUtils.SCRIPT_CLOSE_TAG).append("\n");
responseBuffer.insert(bodyIndex - 1, endScript);
- responseBuffer.insert(headIndex + 6, "\n" +
JavascriptUtils.SCRIPT_OPEN_TAG +
+ responseBuffer.insert(headIndex + 6, "\n" +
JavaScriptUtils.SCRIPT_OPEN_TAG +
"\nvar clientTimeVariable = new
Date().getTime();\n" +
- JavascriptUtils.SCRIPT_CLOSE_TAG + "\n");
+ JavaScriptUtils.SCRIPT_CLOSE_TAG + "\n");
}
log.info(timeTaken + "ms server time taken for request " +
RequestCycle.get().getRequest().getUrl() + " response
size: " + responseBuffer.length());
Copied:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/JavaScriptStripper.java
(from r1044652,
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/JavascriptStripper.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/JavaScriptStripper.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/JavaScriptStripper.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/JavascriptStripper.java&r1=1044652&r2=1044658&rev=1044658&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/JavascriptStripper.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/JavaScriptStripper.java
Sat Dec 11 13:57:56 2010
@@ -22,7 +22,7 @@ package org.apache.wicket.util.string;
*
* @author Matej Knopp
*/
-public class JavascriptStripper
+public class JavaScriptStripper
{
/*
* Determines the state of script processing.
Copied:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/JavaScriptUtils.java
(from r1044652,
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/JavascriptUtils.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/JavaScriptUtils.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/JavaScriptUtils.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/JavascriptUtils.java&r1=1044652&r2=1044658&rev=1044658&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/JavascriptUtils.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/JavaScriptUtils.java
Sat Dec 11 13:57:56 2010
@@ -24,9 +24,8 @@ import org.apache.wicket.request.Respons
*
* @author Juergen Donnerstag
*/
-public class JavascriptUtils
+public class JavaScriptUtils
{
-
/** Script open tag */
public final static String SCRIPT_OPEN_TAG = "<script
type=\"text/javascript\"><!--/*--><![CDATA[/*><!--*/\n";
@@ -56,7 +55,7 @@ public class JavascriptUtils
* The response object
* @param id
*/
- public JavascriptUtils(final Response response, String id)
+ public JavaScriptUtils(final Response response, String id)
{
this.response = response;
writeOpenTag(response, id);
@@ -68,7 +67,7 @@ public class JavascriptUtils
* @param response
* The response object
*/
- public JavascriptUtils(final Response response)
+ public JavaScriptUtils(final Response response)
{
this.response = response;
writeOpenTag(response);
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/JavaScriptTemplate.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/JavaScriptTemplate.java?rev=1044658&r1=1044657&r2=1044658&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/JavaScriptTemplate.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/JavaScriptTemplate.java
Sat Dec 11 13:57:56 2010
@@ -18,7 +18,7 @@ package org.apache.wicket.util.template;
import java.util.Map;
-import org.apache.wicket.util.string.JavascriptUtils;
+import org.apache.wicket.util.string.JavaScriptUtils;
/**
@@ -48,7 +48,7 @@ public final class JavaScriptTemplate ex
@Override
public String getBeforeTemplateContents()
{
- return JavascriptUtils.SCRIPT_OPEN_TAG;
+ return JavaScriptUtils.SCRIPT_OPEN_TAG;
}
/**
@@ -57,7 +57,7 @@ public final class JavaScriptTemplate ex
@Override
public String getAfterTemplateContents()
{
- return JavascriptUtils.SCRIPT_CLOSE_TAG;
+ return JavaScriptUtils.SCRIPT_CLOSE_TAG;
}
/**
Copied:
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/string/JavaScriptStripperTest.java
(from r1044652,
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/string/JavascriptStripperTest.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/string/JavaScriptStripperTest.java?p2=wicket/trunk/wicket/src/test/java/org/apache/wicket/util/string/JavaScriptStripperTest.java&p1=wicket/trunk/wicket/src/test/java/org/apache/wicket/util/string/JavascriptStripperTest.java&r1=1044652&r2=1044658&rev=1044658&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/string/JavascriptStripperTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/string/JavaScriptStripperTest.java
Sat Dec 11 13:57:56 2010
@@ -19,45 +19,45 @@ package org.apache.wicket.util.string;
import junit.framework.TestCase;
/**
- * Tests {...@link JavascriptStripper}
+ * Tests {...@link JavaScriptStripper}
*
* @author <a href="mailto:[email protected]";>Jean-Baptiste Quenot</a>
*/
-public class JavascriptStripperTest extends TestCase
+public class JavaScriptStripperTest extends TestCase
{
public void testUNIXWICKET501()
{
- String s = new
JavascriptStripper().stripCommentsAndWhitespace(" // Handle the common XPath
// expression\n if ( !t.indexOf(\"//\") ) {");
+ String s = new
JavaScriptStripper().stripCommentsAndWhitespace(" // Handle the common XPath
// expression\n if ( !t.indexOf(\"//\") ) {");
assertEquals(" if ( !t.indexOf(\"//\") ) {", s);
}
public void testDOSWICKET501()
{
- String s = new
JavascriptStripper().stripCommentsAndWhitespace(" // Handle the common XPath
// expression\r\n if ( !t.indexOf(\"//\") ) {");
+ String s = new
JavaScriptStripper().stripCommentsAndWhitespace(" // Handle the common XPath
// expression\r\n if ( !t.indexOf(\"//\") ) {");
assertEquals(" \nif ( !t.indexOf(\"//\") ) {", s);
}
public void testMACWICKET501()
{
- String s = new
JavascriptStripper().stripCommentsAndWhitespace(" // Handle the common XPath
// expression\r if ( !t.indexOf(\"//\") ) {");
+ String s = new
JavaScriptStripper().stripCommentsAndWhitespace(" // Handle the common XPath
// expression\r if ( !t.indexOf(\"//\") ) {");
assertEquals(" if ( !t.indexOf(\"//\") ) {", s);
}
public void testRegexp()
{
- String s = new
JavascriptStripper().stripCommentsAndWhitespace(" t =
jQuery.trim(t).replace( /^\\/\\//i, \"\" );");
+ String s = new
JavaScriptStripper().stripCommentsAndWhitespace(" t =
jQuery.trim(t).replace( /^\\/\\//i, \"\" );");
assertEquals(" t = jQuery.trim(t).replace( /^\\/\\//i, \"\"
);", s);
}
public void testRegexp2()
{
- String s = new
JavascriptStripper().stripCommentsAndWhitespace("foo.replace(/\"//*strip me*/,
\"\"); // strip me\rdoFoo();");
+ String s = new
JavaScriptStripper().stripCommentsAndWhitespace("foo.replace(/\"//*strip me*/,
\"\"); // strip me\rdoFoo();");
assertEquals("foo.replace(/\"/, \"\"); doFoo();", s);
}
public void testRegexp3()
{
- String s = new
JavascriptStripper().stripCommentsAndWhitespace("parseFloat(
elem.filter.match(/alpha\\(opacity=(.*)\\)/)[1] ) / 100 : 1;\r//foo");
+ String s = new
JavaScriptStripper().stripCommentsAndWhitespace("parseFloat(
elem.filter.match(/alpha\\(opacity=(.*)\\)/)[1] ) / 100 : 1;\r//foo");
assertEquals("parseFloat(
elem.filter.match(/alpha\\(opacity=(.*)\\)/)[1] ) / 100 : 1;\r",
s);
}
@@ -65,7 +65,7 @@ public class JavascriptStripperTest exte
public void testRegexp4()
{
String before = " attr: /**/ //xyz\n
/\\[((?:[\\w-]*:)?[\\w-]+)\\s*(?:([!^$*~|]?=)\\s*((['\"])([^\\4]*?)\\4|([^'\"][^\\]]*?)))?\\]/
after regex";
- String after = new
JavascriptStripper().stripCommentsAndWhitespace(before);
+ String after = new
JavaScriptStripper().stripCommentsAndWhitespace(before);
String expected = " attr:
/\\[((?:[\\w-]*:)?[\\w-]+)\\s*(?:([!^$*~|]?=)\\s*((['\"])([^\\4]*?)\\4|([^'\"][^\\]]*?)))?\\]/
after regex";
assertEquals(expected, after);
System.out.println(after);
@@ -74,7 +74,7 @@ public class JavascriptStripperTest exte
public void testWICKET1806()
{
String before = "a = [ /^(\\[) *...@?([\\w-]+) *([!*$^~=]*)
*('?\"?)(.*?)\\4 *\\]/ ]; b()";
- String after = new
JavascriptStripper().stripCommentsAndWhitespace(before);
+ String after = new
JavaScriptStripper().stripCommentsAndWhitespace(before);
String expected = "a = [ /^(\\[) *...@?([\\w-]+) *([!*$^~=]*)
*('?\"?)(.*?)\\4 *\\]/ ]; b()";
assertEquals(expected, after);
@@ -83,7 +83,7 @@ public class JavascriptStripperTest exte
public void testWICKET2060_1()
{
String before = " a b c";
- String after = new
JavascriptStripper().stripCommentsAndWhitespace(before);
+ String after = new
JavaScriptStripper().stripCommentsAndWhitespace(before);
String expected = " a b c";
assertEquals(expected, after);
}
@@ -91,7 +91,7 @@ public class JavascriptStripperTest exte
public void testWICKET2060_2()
{
String before = " a \n b c\n\n";
- String after = new
JavascriptStripper().stripCommentsAndWhitespace(before);
+ String after = new
JavaScriptStripper().stripCommentsAndWhitespace(before);
String expected = " a\nb c\n";
assertEquals(expected, after);
}
@@ -99,7 +99,7 @@ public class JavascriptStripperTest exte
public void testWICKET2060_3()
{
String before = "return this.__unbind__(type, fn);";
- String after = new
JavascriptStripper().stripCommentsAndWhitespace(before);
+ String after = new
JavaScriptStripper().stripCommentsAndWhitespace(before);
String expected = "return this.__unbind__(type, fn);";
assertEquals(expected, after);
}
