Updated Branches: refs/heads/master e42f2887c -> 3744105da
Simplify the configuration of global "shouldUseMinifiedResources" flag. Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/3744105d Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/3744105d Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/3744105d Branch: refs/heads/master Commit: 3744105da3358afcdc10811d68407c35d92ad621 Parents: 04c86f9 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Thu Feb 23 10:30:15 2012 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Thu Feb 23 10:30:15 2012 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/wicket/Application.java | 1 + .../apache/wicket/settings/IResourceSettings.java | 2 +- .../wicket/settings/def/ResourceSettings.java | 8 ++------ 3 files changed, 4 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/3744105d/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 47a69ab..8fb224a 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Application.java +++ b/wicket-core/src/main/java/org/apache/wicket/Application.java @@ -303,6 +303,7 @@ public abstract class Application implements UnboundListener, IEventSink case DEVELOPMENT : { getResourceSettings().setResourcePollFrequency(Duration.ONE_SECOND); getResourceSettings().setJavaScriptCompressor(null); + getResourceSettings().setUseMinifiedResources(false); getMarkupSettings().setStripWicketTags(false); getExceptionSettings().setUnexpectedExceptionDisplay( IExceptionSettings.SHOW_EXCEPTION_PAGE); http://git-wip-us.apache.org/repos/asf/wicket/blob/3744105d/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 3ed8e8f..b93d68a 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 @@ -375,7 +375,7 @@ public interface IResourceSettings extends IPropertiesFactoryContext * @param useMinifiedResources * The new value for the setting */ - void setUseMinifiedResources(Boolean useMinifiedResources); + void setUseMinifiedResources(boolean useMinifiedResources); /** * @return Whether pre-minified resources will be used. http://git-wip-us.apache.org/repos/asf/wicket/blob/3744105d/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 7dbd3b0..2263fb1 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 @@ -133,7 +133,7 @@ public class ResourceSettings implements IResourceSettings private boolean useDefaultResourceAggregator = true; - private Boolean useMinifiedResources; + private boolean useMinifiedResources = true; private Comparator<? super RecordedHeaderItem> headerItemComparator = new PriorityFirstComparator( false); @@ -574,7 +574,7 @@ public class ResourceSettings implements IResourceSettings } @Override - public void setUseMinifiedResources(Boolean useMinifiedResources) + public void setUseMinifiedResources(boolean useMinifiedResources) { this.useMinifiedResources = useMinifiedResources; } @@ -582,10 +582,6 @@ public class ResourceSettings implements IResourceSettings @Override public boolean getUseMinifiedResources() { - if (useMinifiedResources == null) - { - return !application.usesDevelopmentConfig(); - } return useMinifiedResources; }
