Author: jdonnerstag
Date: Sat Dec 11 12:22:58 2010
New Revision: 1044640
URL: http://svn.apache.org/viewvc?rev=1044640&view=rev
Log:
rename classes and methods from *JavaScript* to *Javascript*
Issue: WICKET-715
Added:
wicket/trunk/wicket/src/main/java/org/apache/wicket/javascript/DefaultJavaScriptCompressor.java
- copied, changed from r1044639,
wicket/trunk/wicket/src/main/java/org/apache/wicket/javascript/DefaultJavascriptCompressor.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/javascript/IJavaScriptCompressor.java
- copied, changed from r1044639,
wicket/trunk/wicket/src/main/java/org/apache/wicket/javascript/IJavascriptCompressor.java
Removed:
wicket/trunk/wicket/src/main/java/org/apache/wicket/javascript/DefaultJavascriptCompressor.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/javascript/IJavascriptCompressor.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/javascript/NoOpJavascriptCompressor.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/template/PackagedTextTemplate.java
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=1044640&r1=1044639&r2=1044640&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 12:22:58 2010
@@ -35,7 +35,7 @@ import org.apache.wicket.application.ICo
import org.apache.wicket.application.IComponentInstantiationListener;
import org.apache.wicket.event.IEvent;
import org.apache.wicket.event.IEventSink;
-import org.apache.wicket.javascript.DefaultJavascriptCompressor;
+import org.apache.wicket.javascript.DefaultJavaScriptCompressor;
import org.apache.wicket.markup.MarkupFactory;
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.markup.html.IHeaderResponseDecorator;
@@ -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;
}
}
Copied:
wicket/trunk/wicket/src/main/java/org/apache/wicket/javascript/DefaultJavaScriptCompressor.java
(from r1044639,
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?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/javascript/DefaultJavaScriptCompressor.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/javascript/DefaultJavascriptCompressor.java&r1=1044639&r2=1044640&rev=1044640&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 12:22:58 2010
@@ -23,10 +23,10 @@ import org.apache.wicket.util.string.Jav
*
* @author Juergen Donnerstag
*/
-public class DefaultJavascriptCompressor implements IJavascriptCompressor
+public class DefaultJavaScriptCompressor implements IJavaScriptCompressor
{
/**
- * @see
org.apache.wicket.javascript.IJavascriptCompressor#compress(java.lang.String)
+ * @see
org.apache.wicket.javascript.IJavaScriptCompressor#compress(java.lang.String)
*/
public String compress(String original)
{
Copied:
wicket/trunk/wicket/src/main/java/org/apache/wicket/javascript/IJavaScriptCompressor.java
(from r1044639,
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?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/javascript/IJavaScriptCompressor.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/javascript/IJavascriptCompressor.java&r1=1044639&r2=1044640&rev=1044640&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 12:22:58 2010
@@ -21,7 +21,7 @@ package org.apache.wicket.javascript;
*
* @author Juergen Donnerstag
*/
-public interface IJavascriptCompressor
+public interface IJavaScriptCompressor
{
/**
* Remove comments and whitespaces from the javascript
Modified:
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?rev=1044640&r1=1044639&r2=1044640&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 12:22:58 2010
@@ -21,10 +21,10 @@ 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)
+ * @see
org.apache.wicket.javascript.IJavaScriptCompressor#compress(java.lang.String)
*/
public String compress(String original)
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IResourceSettings.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IResourceSettings.java?rev=1044640&r1=1044639&r2=1044640&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IResourceSettings.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IResourceSettings.java
Sat Dec 11 12:22:58 2010
@@ -20,7 +20,7 @@ import java.util.List;
import org.apache.wicket.IResourceFactory;
import org.apache.wicket.Localizer;
-import org.apache.wicket.javascript.IJavascriptCompressor;
+import org.apache.wicket.javascript.IJavaScriptCompressor;
import org.apache.wicket.markup.html.IPackageResourceGuard;
import org.apache.wicket.markup.html.PackageResourceGuard;
import org.apache.wicket.model.IModel;
@@ -306,7 +306,7 @@ public interface IResourceSettings
* The implementation to be used
* @return The old value
*/
- IJavascriptCompressor setJavascriptCompressor(IJavascriptCompressor
compressor);
+ IJavaScriptCompressor setJavascriptCompressor(IJavaScriptCompressor
compressor);
/**
* Get the javascript compressor to remove comments and whitespace
characters from javascripts
@@ -314,7 +314,7 @@ public interface IResourceSettings
* @return whether the comments and whitespace characters will be
stripped from resources served
* through {...@link JavascriptPackageResource}. Null is a
valid value.
*/
- IJavascriptCompressor getJavascriptCompressor();
+ IJavaScriptCompressor getJavascriptCompressor();
/**
* Placeholder string for '..' within resource urls (which will be
crippled by the browser and
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/def/ResourceSettings.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/def/ResourceSettings.java?rev=1044640&r1=1044639&r2=1044640&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/def/ResourceSettings.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/def/ResourceSettings.java
Sat Dec 11 12:22:58 2010
@@ -22,7 +22,7 @@ import java.util.Map;
import org.apache.wicket.Application;
import org.apache.wicket.IResourceFactory;
import org.apache.wicket.Localizer;
-import org.apache.wicket.javascript.IJavascriptCompressor;
+import org.apache.wicket.javascript.IJavaScriptCompressor;
import org.apache.wicket.markup.html.IPackageResourceGuard;
import org.apache.wicket.markup.html.PackageResourceGuard;
import org.apache.wicket.resource.PropertiesFactory;
@@ -101,7 +101,7 @@ public class ResourceSettings implements
private Duration defaultCacheDuration = Duration.hours(1);
/** The Javascript compressor */
- private IJavascriptCompressor javascriptCompressor;
+ private IJavaScriptCompressor javascriptCompressor;
/** escape string for '..' within resource keys */
private String parentFolderPlaceholder = null;
@@ -386,17 +386,17 @@ public class ResourceSettings implements
/**
* @see
org.apache.wicket.settings.IResourceSettings#getJavascriptCompressor()
*/
- public IJavascriptCompressor getJavascriptCompressor()
+ public IJavaScriptCompressor getJavascriptCompressor()
{
return javascriptCompressor;
}
/**
- * @see
org.apache.wicket.settings.IResourceSettings#setJavascriptCompressor(org.apache.wicket.javascript.IJavascriptCompressor)
+ * @see
org.apache.wicket.settings.IResourceSettings#setJavascriptCompressor(org.apache.wicket.javascript.IJavaScriptCompressor)
*/
- public IJavascriptCompressor
setJavascriptCompressor(IJavascriptCompressor compressor)
+ public IJavaScriptCompressor
setJavascriptCompressor(IJavaScriptCompressor compressor)
{
- IJavascriptCompressor old = javascriptCompressor;
+ IJavaScriptCompressor old = javascriptCompressor;
javascriptCompressor = compressor;
return old;
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/PackagedTextTemplate.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/PackagedTextTemplate.java?rev=1044640&r1=1044639&r2=1044640&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/PackagedTextTemplate.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/PackagedTextTemplate.java
Sat Dec 11 12:22:58 2010
@@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentHa
import org.apache.wicket.Application;
import org.apache.wicket.MetaDataKey;
-import org.apache.wicket.javascript.IJavascriptCompressor;
+import org.apache.wicket.javascript.IJavaScriptCompressor;
import org.apache.wicket.util.io.Streams;
import org.apache.wicket.util.lang.Packages;
import org.apache.wicket.util.resource.IResourceStream;
@@ -212,7 +212,7 @@ public class PackagedTextTemplate extend
@Override
public String getString()
{
- IJavascriptCompressor compressor = Application.get()
+ IJavaScriptCompressor compressor = Application.get()
.getResourceSettings()
.getJavascriptCompressor();
