You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2012/05/14 16:06:56 UTC
git commit: WICKET-4556 Remove
IResourceSettings#getUseDefaultResourceAggregator
Updated Branches:
refs/heads/master c0b25b980 -> 06a726a84
WICKET-4556 Remove IResourceSettings#getUseDefaultResourceAggregator
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/06a726a8
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/06a726a8
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/06a726a8
Branch: refs/heads/master
Commit: 06a726a84b18dcd3824b9f73b07b28319fe688a8
Parents: c0b25b9
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon May 14 16:06:08 2012 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon May 14 16:06:08 2012 +0200
----------------------------------------------------------------------
.../main/java/org/apache/wicket/Application.java | 12 +++++-------
.../apache/wicket/settings/IResourceSettings.java | 15 ---------------
.../wicket/settings/def/ResourceSettings.java | 14 --------------
3 files changed, 5 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/06a726a8/wicket-core/src/main/java/org/apache/wicket/Application.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Application.java b/wicket-core/src/main/java/org/apache/wicket/Application.java
index 98078ea..bf16fa9 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Application.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Application.java
@@ -1667,18 +1667,16 @@ public abstract class Application implements UnboundListener, IEventSink
* the response Wicket created
* @return the response Wicket should use in IHeaderContributor traversal
*/
- public final IHeaderResponse decorateHeaderResponse(IHeaderResponse response)
+ public final IHeaderResponse decorateHeaderResponse(final IHeaderResponse response)
{
- if (getResourceSettings().getUseDefaultResourceAggregator())
- {
- response = new ResourceAggregator(response);
- }
+ final IHeaderResponse aggregatingResponse = new ResourceAggregator(response);
if (headerResponseDecorator == null)
{
- return response;
+ return aggregatingResponse;
}
- return headerResponseDecorator.decorate(response);
+
+ return headerResponseDecorator.decorate(aggregatingResponse);
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/06a726a8/wicket-core/src/main/java/org/apache/wicket/settings/IResourceSettings.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/settings/IResourceSettings.java b/wicket-core/src/main/java/org/apache/wicket/settings/IResourceSettings.java
index 225f41c..122348b 100644
--- a/wicket-core/src/main/java/org/apache/wicket/settings/IResourceSettings.java
+++ b/wicket-core/src/main/java/org/apache/wicket/settings/IResourceSettings.java
@@ -351,21 +351,6 @@ public interface IResourceSettings extends IPropertiesFactoryContext
ICssCompressor getCssCompressor();
/**
- * Allows to disable the default {@linkplain ResourceAggregator resource aggregation}. If this
- * setting is disabled, you will have to take care of implementing resource dependencies and
- * bundles yourself.
- *
- * @param useDefaultResourceAggregator
- * The new value for the setting
- */
- void setUseDefaultResourceAggregator(boolean useDefaultResourceAggregator);
-
- /**
- * @return Whether to use the default {@linkplain org.apache.wicket.markup.head.ResourceAggregator resource aggregator}.
- */
- boolean getUseDefaultResourceAggregator();
-
- /**
* Sets whether to use pre-minified resources when available. Minified resources are detected by
* name. The minified version of {@code x.js} is expected to be called {@code x.min.js}. For css
* files, the same convention is used: {@code x.min.css} is the minified version of
http://git-wip-us.apache.org/repos/asf/wicket/blob/06a726a8/wicket-core/src/main/java/org/apache/wicket/settings/def/ResourceSettings.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/settings/def/ResourceSettings.java b/wicket-core/src/main/java/org/apache/wicket/settings/def/ResourceSettings.java
index 63e78dc..3909335 100644
--- a/wicket-core/src/main/java/org/apache/wicket/settings/def/ResourceSettings.java
+++ b/wicket-core/src/main/java/org/apache/wicket/settings/def/ResourceSettings.java
@@ -132,8 +132,6 @@ public class ResourceSettings implements IResourceSettings
// application these settings are bound to
private final Application application;
- private boolean useDefaultResourceAggregator = true;
-
private boolean useMinifiedResources = true;
private Comparator<? super RecordedHeaderItem> headerItemComparator = new PriorityFirstComparator(
@@ -559,18 +557,6 @@ public class ResourceSettings implements IResourceSettings
}
@Override
- public void setUseDefaultResourceAggregator(boolean useDefaultResourceAggregator)
- {
- this.useDefaultResourceAggregator = useDefaultResourceAggregator;
- }
-
- @Override
- public boolean getUseDefaultResourceAggregator()
- {
- return useDefaultResourceAggregator;
- }
-
- @Override
public void setUseMinifiedResources(boolean useMinifiedResources)
{
this.useMinifiedResources = useMinifiedResources;