You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pe...@apache.org on 2011/04/14 01:10:47 UTC
svn commit: r1091973 - in /wicket/trunk:
wicket-core/src/main/java/org/apache/wicket/markup/html/tree/
wicket-core/src/main/java/org/apache/wicket/request/resource/
wicket-core/src/main/java/org/apache/wicket/settings/
wicket-core/src/main/java/org/apa...
Author: pete
Date: Wed Apr 13 23:10:47 2011
New Revision: 1091973
URL: http://svn.apache.org/viewvc?rev=1091973&view=rev
Log:
WICKET-3526: removed CompressedResourceReference
Removed:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/CompressedResourceReference.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/IResourceSettings.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/ResourceSettings.java
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java?rev=1091973&r1=1091972&r2=1091973&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java Wed Apr 13 23:10:47 2011
@@ -31,7 +31,7 @@ import org.apache.wicket.markup.html.Web
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.Response;
-import org.apache.wicket.request.resource.CompressedResourceReference;
+import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.lang.EnumeratedType;
import org.apache.wicket.util.string.Strings;
@@ -68,7 +68,7 @@ public abstract class BaseTree extends A
}
// default stylesheet resource
- private static final ResourceReference CSS = new CompressedResourceReference(BaseTree.class,
+ private static final ResourceReference CSS = new PackageResourceReference(BaseTree.class,
"res/base-tree.css");
/**
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/IResourceSettings.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/IResourceSettings.java?rev=1091973&r1=1091972&r2=1091973&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/IResourceSettings.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/IResourceSettings.java Wed Apr 13 23:10:47 2011
@@ -106,15 +106,6 @@ public interface IResourceSettings
Duration getDefaultCacheDuration();
/**
- * Whether to disable gzip compression for resources. You need this on SAP, which gzips things
- * twice.
- *
- * @return True if we should disable gzip compression
- * @since 1.3.0
- */
- boolean getDisableGZipCompression();
-
- /**
* Get the application's localizer.
*
* @see IResourceSettings#addStringResourceLoader(org.apache.wicket.resource.loader.IStringResourceLoader)
@@ -206,15 +197,6 @@ public interface IResourceSettings
void setDefaultCacheDuration(Duration defaultDuration);
/**
- * Sets whether to disable gzip compression for resources. You need to set this on some SAP
- * versions, which gzip things twice.
- *
- * @param disableGZipCompression
- * @since 1.3.0
- */
- void setDisableGZipCompression(final boolean disableGZipCompression);
-
- /**
* Sets the localizer which will be used to find property values.
*
* @param localizer
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/ResourceSettings.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/ResourceSettings.java?rev=1091973&r1=1091972&r2=1091973&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/ResourceSettings.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/ResourceSettings.java Wed Apr 13 23:10:47 2011
@@ -61,11 +61,6 @@ import org.apache.wicket.util.watch.Modi
*/
public class ResourceSettings implements IResourceSettings
{
- /**
- * Whether we should disable gzip compression for resources.
- */
- private boolean disableGZipCompression = false;
-
/** I18N support */
private Localizer localizer;
@@ -158,14 +153,6 @@ public class ResourceSettings implements
}
/**
- * @see org.apache.wicket.settings.IResourceSettings#getDisableGZipCompression()
- */
- public boolean getDisableGZipCompression()
- {
- return disableGZipCompression;
- }
-
- /**
* @see org.apache.wicket.settings.IResourceSettings#getLocalizer()
*/
public Localizer getLocalizer()
@@ -298,14 +285,6 @@ public class ResourceSettings implements
}
/**
- * @see org.apache.wicket.settings.IResourceSettings#setDisableGZipCompression(boolean)
- */
- public void setDisableGZipCompression(boolean disableGZipCompression)
- {
- this.disableGZipCompression = disableGZipCompression;
- }
-
- /**
* @see org.apache.wicket.settings.IResourceSettings#setLocalizer(org.apache.wicket.Localizer)
*/
public void setLocalizer(final Localizer localizer)
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=1091973&r1=1091972&r2=1091973&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 Wed Apr 13 23:10:47 2011
@@ -18,7 +18,7 @@ package org.apache.wicket.extensions.yui
import org.apache.wicket.Application;
import org.apache.wicket.markup.html.IHeaderResponse;
-import org.apache.wicket.request.resource.CompressedResourceReference;
+import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
/**
@@ -56,7 +56,7 @@ public final class YuiLib
sb.append("-min");
}
sb.append(".js");
- YUILOADER = new CompressedResourceReference(YuiLib.class, sb.toString());
+ YUILOADER = new PackageResourceReference(YuiLib.class, sb.toString());
}
return YUILOADER;
}
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=1091973&r1=1091972&r2=1091973&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 Wed Apr 13 23:10:47 2011
@@ -29,7 +29,6 @@ import org.apache.wicket.markup.html.ima
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.request.resource.CompressedResourceReference;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.request.resource.PackageResourceReference;
@@ -122,7 +121,7 @@ public class DebugBar extends DevUtilsPa
@Override
public void renderHead(final IHeaderResponse response)
{
- response.renderCSSReference(new CompressedResourceReference(DebugBar.class,
+ response.renderCSSReference(new PackageResourceReference(DebugBar.class,
"wicket-debugbar.css"));
response.renderJavaScriptReference(new JavaScriptResourceReference(DebugBar.class,
"wicket-debugbar.js"));
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=1091973&r1=1091972&r2=1091973&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 Wed Apr 13 23:10:47 2011
@@ -35,10 +35,9 @@ import org.apache.wicket.request.IReques
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.handler.PageProvider;
import org.apache.wicket.request.handler.RenderPageRequestHandler;
-import org.apache.wicket.request.resource.CompressedResourceReference;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
+import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
-import org.apache.wicket.settings.IPageSettings;
import org.apache.wicket.util.lang.EnumeratedType;
import org.apache.wicket.util.string.AppendingStringBuffer;
import org.apache.wicket.util.string.Strings;
@@ -113,7 +112,6 @@ import org.apache.wicket.util.string.Str
* in another form (nesting forms is legal in Wicket) and that the form on modal window is submitted
* before the window get closed.
*
- * @see IPageSettings#setAutomaticMultiWindowSupport(boolean)
* @author Matej Knopp
*/
public class ModalWindow extends Panel
@@ -129,7 +127,7 @@ public class ModalWindow extends Panel
private static ResourceReference JAVASCRIPT = new JavaScriptResourceReference(
ModalWindow.class, "res/modal.js");
- private static ResourceReference CSS = new CompressedResourceReference(ModalWindow.class,
+ private static ResourceReference CSS = new PackageResourceReference(ModalWindow.class,
"res/modal.css");
/** the default id of the content component */
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=1091973&r1=1091972&r2=1091973&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 Wed Apr 13 23:10:47 2011
@@ -35,8 +35,8 @@ import org.apache.wicket.markup.html.pan
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.ResourceModel;
-import org.apache.wicket.request.resource.CompressedResourceReference;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
+import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
@@ -116,7 +116,7 @@ public class Palette<T> extends Panel
Palette.class, "palette.js");
/** reference to the palette's css resource */
- private static final ResourceReference CSS = new CompressedResourceReference(Palette.class,
+ private static final ResourceReference CSS = new PackageResourceReference(Palette.class,
"palette.css");
/**
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java?rev=1091973&r1=1091972&r2=1091973&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java Wed Apr 13 23:10:47 2011
@@ -37,7 +37,6 @@ import org.apache.wicket.request.IReques
import org.apache.wicket.request.Response;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;
-import org.apache.wicket.request.resource.CompressedResourceReference;
import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.lang.EnumeratedType;
@@ -120,7 +119,7 @@ public abstract class DefaultAbstractTre
/**
* Reference to the css file.
*/
- private static final ResourceReference CSS = new CompressedResourceReference(
+ private static final ResourceReference CSS = new PackageResourceReference(
DefaultAbstractTree.class, "res/tree.css");
/** Reference to the icon of closed tree folder */
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java?rev=1091973&r1=1091972&r2=1091973&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java Wed Apr 13 23:10:47 2011
@@ -33,7 +33,7 @@ import org.apache.wicket.markup.html.pan
import org.apache.wicket.markup.html.tree.AbstractTree;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.request.resource.CompressedResourceReference;
+import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
@@ -110,7 +110,7 @@ public class TreeTable extends DefaultAb
}
/** Reference to the css file. */
- private static final ResourceReference CSS = new CompressedResourceReference(
+ private static final ResourceReference CSS = new PackageResourceReference(
DefaultAbstractTree.class, "res/tree-table.css");
private static final long serialVersionUID = 1L;