Updated Branches: refs/heads/master 36c90fa61 -> 99eec004e
WICKET-4422 Minimize Wicket's Ajax JavaScript files at build time Use Yahoo compressor to minimize our .js and .css resources Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/99eec004 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/99eec004 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/99eec004 Branch: refs/heads/master Commit: 99eec004ea31b4830ff03de54addffb4355800c1 Parents: 36c90fa Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue Feb 21 13:50:32 2012 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue Feb 21 13:50:32 2012 +0100 ---------------------------------------------------------------------- pom.xml | 23 +++++++++++++-- wicket-core/pom.xml | 11 ++++++- .../markup/html/form/AbstractCheckSelector.java | 3 +- .../wicket/markup/html/form/CheckBoxSelector.java | 3 +- .../markup/html/form/CheckGroupSelector.java | 3 +- .../html/form/CheckboxMultipleChoiceSelector.java | 3 +- .../html/form/upload/MultiFileUploadField.java | 3 +- wicket-extensions/pom.xml | 8 +++++ .../autocomplete/AbstractAutoCompleteBehavior.java | 4 +- .../DefaultCssAutoCompleteTextField.java | 6 ++-- .../markup/html/form/upload/UploadProgressBar.java | 9 +++-- .../ajax/markup/html/modal/ModalWindow.java | 8 ++-- .../markup/html/form/palette/Palette.java | 10 +++--- .../html/repeater/tree/theme/HumanTheme.java | 4 +- .../html/repeater/tree/theme/WindowsTheme.java | 4 +- .../extensions/markup/html/tree/AbstractTree.java | 4 +- .../extensions/markup/html/tree/BaseTree.java | 4 +- .../markup/html/tree/DefaultAbstractTree.java | 3 +- .../markup/html/tree/table/TreeTable.java | 4 +- .../wicket/extensions/rating/RatingPanel.java | 5 ++- .../apache/wicket/extensions/wizard/Wizard.java | 10 +++--- 21 files changed, 87 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/99eec004/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index af1c8dc..2f3fb84 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, @@ -114,7 +114,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <inherited>true</inherited> + <inherited>true</inherited> <configuration> <excludedGroups>org.apache.wicket.util.SlowTests</excludedGroups> </configuration> @@ -127,7 +127,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <inherited>true</inherited> + <inherited>true</inherited> <configuration> <skip>true</skip> </configuration> @@ -758,6 +758,23 @@ <artifactId>maven-archetype-plugin</artifactId> <version>2.0</version> </plugin> + <plugin> + <groupId>net.alchim31.maven</groupId> + <artifactId>yuicompressor-maven-plugin</artifactId> + <version>1.3.0</version> + <configuration> + <statistics>true</statistics> + <jswarn>false</jswarn> + <suffix>.min</suffix> + </configuration> + <executions> + <execution> + <goals> + <goal>compress</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </pluginManagement> </build> http://git-wip-us.apache.org/repos/asf/wicket/blob/99eec004/wicket-core/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-core/pom.xml b/wicket-core/pom.xml index ee9b898..96feeb2 100644 --- a/wicket-core/pom.xml +++ b/wicket-core/pom.xml @@ -7,7 +7,7 @@ (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, @@ -78,6 +78,15 @@ <licenseLocation>${basedir}/../../../common/lib/clover.license</licenseLocation> </configuration> </plugin> + <plugin> + <groupId>net.alchim31.maven</groupId> + <artifactId>yuicompressor-maven-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/jquery*.js</exclude> + </excludes> + </configuration> + </plugin> </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/wicket/blob/99eec004/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractCheckSelector.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractCheckSelector.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractCheckSelector.java index 6ecc3f1..1243c39 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractCheckSelector.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractCheckSelector.java @@ -24,6 +24,7 @@ import org.apache.wicket.request.resource.ResourceReference; import org.apache.wicket.resource.CoreLibrariesContributor; import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.markup.head.OnLoadHeaderItem; +import org.apache.wicket.resource.MinifiedAwareJavaScriptResourceReference; /** * Base class for all Javascript-based "select-all" checkboxes. Provides a simple "select all" @@ -42,7 +43,7 @@ public abstract class AbstractCheckSelector extends LabeledWebMarkupContainer { private static final long serialVersionUID = 1L; - private static final ResourceReference JS = new PackageResourceReference( + private static final ResourceReference JS = new MinifiedAwareJavaScriptResourceReference( AbstractCheckSelector.class, "AbstractCheckSelector.js"); /** http://git-wip-us.apache.org/repos/asf/wicket/blob/99eec004/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckBoxSelector.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckBoxSelector.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckBoxSelector.java index 7b92df7..66a08cb 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckBoxSelector.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckBoxSelector.java @@ -23,6 +23,7 @@ import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.request.resource.ResourceReference; +import org.apache.wicket.resource.MinifiedAwareJavaScriptResourceReference; /** @@ -37,7 +38,7 @@ public class CheckBoxSelector extends AbstractCheckSelector { private static final long serialVersionUID = 1L; - private final static ResourceReference JS = new PackageResourceReference( + private final static ResourceReference JS = new MinifiedAwareJavaScriptResourceReference( CheckBoxSelector.class, "CheckBoxSelector.js"); /** http://git-wip-us.apache.org/repos/asf/wicket/blob/99eec004/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckGroupSelector.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckGroupSelector.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckGroupSelector.java index 128206b..f2d608f 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckGroupSelector.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckGroupSelector.java @@ -21,6 +21,7 @@ import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.request.resource.ResourceReference; +import org.apache.wicket.resource.MinifiedAwareJavaScriptResourceReference; /** * Selects and deselects all Check components under the same CheckGroup as itself. Selection @@ -40,7 +41,7 @@ public class CheckGroupSelector extends AbstractCheckSelector /** */ private static final long serialVersionUID = 1L; - private final static ResourceReference JS = new PackageResourceReference( + private final static ResourceReference JS = new MinifiedAwareJavaScriptResourceReference( CheckGroupSelector.class, "CheckGroupSelector.js"); private CheckGroup<?> group; http://git-wip-us.apache.org/repos/asf/wicket/blob/99eec004/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckboxMultipleChoiceSelector.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckboxMultipleChoiceSelector.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckboxMultipleChoiceSelector.java index 7f80092..9e62a69 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckboxMultipleChoiceSelector.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckboxMultipleChoiceSelector.java @@ -20,6 +20,7 @@ import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.request.resource.ResourceReference; +import org.apache.wicket.resource.MinifiedAwareJavaScriptResourceReference; /** @@ -34,7 +35,7 @@ public class CheckboxMultipleChoiceSelector extends AbstractCheckSelector { private static final long serialVersionUID = 1L; - private final static ResourceReference JS = new PackageResourceReference( + private final static ResourceReference JS = new MinifiedAwareJavaScriptResourceReference( CheckboxMultipleChoiceSelector.class, "CheckboxMultipleChoiceSelector.js"); private final CheckBoxMultipleChoice<?> choiceComponent; http://git-wip-us.apache.org/repos/asf/wicket/blob/99eec004/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java index c8376d9..4b9f3a1 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java @@ -40,6 +40,7 @@ import org.apache.wicket.request.resource.JavaScriptResourceReference; import org.apache.wicket.request.resource.ResourceReference; import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.markup.head.OnDomReadyHeaderItem; +import org.apache.wicket.resource.MinifiedAwareJavaScriptResourceReference; import org.apache.wicket.util.convert.ConversionException; import org.apache.wicket.util.string.Strings; import org.apache.wicket.util.upload.FileItem; @@ -93,7 +94,7 @@ public class MultiFileUploadField extends FormComponentPanel<Collection<FileUplo private static final String MAGIC_SEPARATOR = "_mf_"; - private static final ResourceReference JS = new JavaScriptResourceReference( + private static final ResourceReference JS = new MinifiedAwareJavaScriptResourceReference( MultiFileUploadField.class, "MultiFileUploadField.js"); http://git-wip-us.apache.org/repos/asf/wicket/blob/99eec004/wicket-extensions/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-extensions/pom.xml b/wicket-extensions/pom.xml index 7c3fe21..2591dca 100644 --- a/wicket-extensions/pom.xml +++ b/wicket-extensions/pom.xml @@ -39,4 +39,12 @@ <optional>true</optional> </dependency> </dependencies> + <build> + <plugins> + <plugin> + <groupId>net.alchim31.maven</groupId> + <artifactId>yuicompressor-maven-plugin</artifactId> + </plugin> + </plugins> + </build> </project> http://git-wip-us.apache.org/repos/asf/wicket/blob/99eec004/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java index 6218e65..b47fa29 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java @@ -24,9 +24,9 @@ import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.markup.head.OnDomReadyHeaderItem; import org.apache.wicket.request.cycle.RequestCycle; -import org.apache.wicket.request.resource.JavaScriptResourceReference; import org.apache.wicket.request.resource.ResourceReference; import org.apache.wicket.resource.CoreLibrariesContributor; +import org.apache.wicket.resource.MinifiedAwareJavaScriptResourceReference; import org.apache.wicket.util.string.Strings; /** @@ -36,7 +36,7 @@ import org.apache.wicket.util.string.Strings; */ public abstract class AbstractAutoCompleteBehavior extends AbstractDefaultAjaxBehavior { - private static final ResourceReference AUTOCOMPLETE_JS = new JavaScriptResourceReference( + private static final ResourceReference AUTOCOMPLETE_JS = new MinifiedAwareJavaScriptResourceReference( AutoCompleteBehavior.class, "wicket-autocomplete.js"); private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/wicket/blob/99eec004/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/DefaultCssAutoCompleteTextField.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/DefaultCssAutoCompleteTextField.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/DefaultCssAutoCompleteTextField.java index 7de8288..d7f4258 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/DefaultCssAutoCompleteTextField.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/DefaultCssAutoCompleteTextField.java @@ -16,10 +16,10 @@ */ package org.apache.wicket.extensions.ajax.markup.html.autocomplete; +import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.model.IModel; -import org.apache.wicket.request.resource.PackageResourceReference; -import org.apache.wicket.markup.head.CssHeaderItem; +import org.apache.wicket.resource.MinifiedAwareCssResourceReference; /** * An {@link AutoCompleteTextField} which automatically includes the default CSS for the @@ -50,7 +50,7 @@ public abstract class DefaultCssAutoCompleteTextField<T> extends AutoCompleteTex { super.renderHead(response); - response.render(CssHeaderItem.forReference(new PackageResourceReference( + response.render(CssHeaderItem.forReference(new MinifiedAwareCssResourceReference( DefaultCssAutoCompleteTextField.class, "DefaultCssAutoCompleteTextField.css"))); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/99eec004/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java index 1782ddb..5fac90d 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java @@ -24,6 +24,7 @@ import org.apache.wicket.IInitializer; import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow; import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.IHeaderResponse; +import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.markup.head.OnDomReadyHeaderItem; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.form.Form; @@ -31,11 +32,11 @@ import org.apache.wicket.markup.html.form.upload.FileUploadField; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.StringResourceModel; -import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.request.resource.ResourceReference; import org.apache.wicket.request.resource.SharedResourceReference; import org.apache.wicket.resource.CoreLibrariesContributor; -import org.apache.wicket.markup.head.JavaScriptHeaderItem; +import org.apache.wicket.resource.MinifiedAwareCssResourceReference; +import org.apache.wicket.resource.MinifiedAwareJavaScriptResourceReference; import org.apache.wicket.util.visit.IVisit; import org.apache.wicket.util.visit.IVisitor; import org.slf4j.Logger; @@ -109,10 +110,10 @@ public class UploadProgressBar extends Panel } } - private static final ResourceReference JS = new PackageResourceReference( + private static final ResourceReference JS = new MinifiedAwareJavaScriptResourceReference( UploadProgressBar.class, "progressbar.js"); - private static final ResourceReference CSS = new PackageResourceReference( + private static final ResourceReference CSS = new MinifiedAwareCssResourceReference( UploadProgressBar.class, "UploadProgressBar.css"); private static final String RESOURCE_NAME = UploadProgressBar.class.getName(); http://git-wip-us.apache.org/repos/asf/wicket/blob/99eec004/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java index b01bdeb..089baac 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java @@ -35,10 +35,10 @@ import org.apache.wicket.request.IRequestHandler; 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.JavaScriptResourceReference; -import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.request.resource.ResourceReference; import org.apache.wicket.resource.CoreLibrariesContributor; +import org.apache.wicket.resource.MinifiedAwareCssResourceReference; +import org.apache.wicket.resource.MinifiedAwareJavaScriptResourceReference; import org.apache.wicket.util.lang.EnumeratedType; import org.apache.wicket.util.string.AppendingStringBuffer; import org.apache.wicket.util.string.Strings; @@ -125,10 +125,10 @@ public class ModalWindow extends Panel /** CSS class for window with gray border. */ public final static String CSS_CLASS_GRAY = "w_silver"; - private static final ResourceReference JAVASCRIPT = new JavaScriptResourceReference( + private static final ResourceReference JAVASCRIPT = new MinifiedAwareJavaScriptResourceReference( ModalWindow.class, "res/modal.js"); - private static final ResourceReference CSS = new PackageResourceReference(ModalWindow.class, + private static final ResourceReference CSS = new MinifiedAwareCssResourceReference(ModalWindow.class, "res/modal.css"); /** the default id of the content component */ http://git-wip-us.apache.org/repos/asf/wicket/blob/99eec004/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java index 32c7274..020acab 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java @@ -28,6 +28,7 @@ import org.apache.wicket.extensions.markup.html.form.palette.component.Selection import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.IHeaderResponse; +import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.FormComponent; @@ -36,10 +37,9 @@ import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.ResourceModel; -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.markup.head.JavaScriptHeaderItem; +import org.apache.wicket.resource.MinifiedAwareCssResourceReference; +import org.apache.wicket.resource.MinifiedAwareJavaScriptResourceReference; /** @@ -114,11 +114,11 @@ public class Palette<T> extends Panel private Component selectionComponent; /** reference to the palette's javascript resource */ - private static final ResourceReference JAVASCRIPT = new JavaScriptResourceReference( + private static final ResourceReference JAVASCRIPT = new MinifiedAwareJavaScriptResourceReference( Palette.class, "palette.js"); /** reference to the palette's css resource */ - private static final ResourceReference CSS = new PackageResourceReference(Palette.class, + private static final ResourceReference CSS = new MinifiedAwareCssResourceReference(Palette.class, "palette.css"); /** http://git-wip-us.apache.org/repos/asf/wicket/blob/99eec004/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/theme/HumanTheme.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/theme/HumanTheme.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/theme/HumanTheme.java index 70efe17..57a98af 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/theme/HumanTheme.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/theme/HumanTheme.java @@ -21,8 +21,8 @@ import org.apache.wicket.behavior.Behavior; import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.IHeaderResponse; -import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.request.resource.ResourceReference; +import org.apache.wicket.resource.MinifiedAwareCssResourceReference; /** * @author svenmeier @@ -31,7 +31,7 @@ public class HumanTheme extends Behavior { private static final long serialVersionUID = 1L; - private static final ResourceReference CSS = new PackageResourceReference(WindowsTheme.class, + private static final ResourceReference CSS = new MinifiedAwareCssResourceReference(WindowsTheme.class, "human/theme.css"); @Override http://git-wip-us.apache.org/repos/asf/wicket/blob/99eec004/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/theme/WindowsTheme.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/theme/WindowsTheme.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/theme/WindowsTheme.java index 29c8a0d..f2b42e9 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/theme/WindowsTheme.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/theme/WindowsTheme.java @@ -21,8 +21,8 @@ import org.apache.wicket.behavior.Behavior; import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.IHeaderResponse; -import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.request.resource.ResourceReference; +import org.apache.wicket.resource.MinifiedAwareCssResourceReference; /** * @author svenmeier @@ -31,7 +31,7 @@ public class WindowsTheme extends Behavior { private static final long serialVersionUID = 1L; - private static final ResourceReference CSS = new PackageResourceReference(WindowsTheme.class, + private static final ResourceReference CSS = new MinifiedAwareCssResourceReference(WindowsTheme.class, "windows/theme.css"); @Override http://git-wip-us.apache.org/repos/asf/wicket/blob/99eec004/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/AbstractTree.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/AbstractTree.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/AbstractTree.java index 60dfaf2..9776271 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/AbstractTree.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/AbstractTree.java @@ -48,8 +48,8 @@ import org.apache.wicket.model.IDetachable; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.request.Response; -import org.apache.wicket.request.resource.JavaScriptResourceReference; import org.apache.wicket.request.resource.ResourceReference; +import org.apache.wicket.resource.MinifiedAwareJavaScriptResourceReference; import org.apache.wicket.util.lang.Args; import org.apache.wicket.util.string.AppendingStringBuffer; import org.apache.wicket.util.visit.IVisit; @@ -1362,7 +1362,7 @@ public abstract class AbstractTree extends Panel return item.getMarkupId().substring(skip); } - private final static ResourceReference JAVASCRIPT = new JavaScriptResourceReference( + private final static ResourceReference JAVASCRIPT = new MinifiedAwareJavaScriptResourceReference( AbstractTree.class, "res/tree.js"); /** http://git-wip-us.apache.org/repos/asf/wicket/blob/99eec004/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/BaseTree.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/BaseTree.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/BaseTree.java index ba73c56..ff57141 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/BaseTree.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/BaseTree.java @@ -33,8 +33,8 @@ import org.apache.wicket.markup.html.WebMarkupContainer; 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.PackageResourceReference; import org.apache.wicket.request.resource.ResourceReference; +import org.apache.wicket.resource.MinifiedAwareCssResourceReference; import org.apache.wicket.util.string.Strings; /** @@ -70,7 +70,7 @@ public abstract class BaseTree extends AbstractTree } // default stylesheet resource - private static final ResourceReference CSS = new PackageResourceReference(BaseTree.class, + private static final ResourceReference CSS = new MinifiedAwareCssResourceReference(BaseTree.class, "res/base-tree.css"); /** http://git-wip-us.apache.org/repos/asf/wicket/blob/99eec004/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java index b490c9b..52ea51b 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java @@ -39,6 +39,7 @@ import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler; import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.request.resource.ResourceReference; +import org.apache.wicket.resource.MinifiedAwareCssResourceReference; /** * Tree class that contains convenient functions related to presentation of the tree, which includes @@ -71,7 +72,7 @@ public abstract class DefaultAbstractTree extends AbstractTree /** * Reference to the css file. */ - private static final ResourceReference CSS = new PackageResourceReference( + private static final ResourceReference CSS = new MinifiedAwareCssResourceReference( DefaultAbstractTree.class, "res/tree.css"); /** Reference to the icon of closed tree folder */ http://git-wip-us.apache.org/repos/asf/wicket/blob/99eec004/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java index ae8cc89..950dbc4 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java @@ -35,8 +35,8 @@ import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.panel.Fragment; import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; -import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.request.resource.ResourceReference; +import org.apache.wicket.resource.MinifiedAwareCssResourceReference; /** @@ -112,7 +112,7 @@ public class TreeTable extends DefaultAbstractTree } /** Reference to the css file. */ - private static final ResourceReference CSS = new PackageResourceReference( + private static final ResourceReference CSS = new MinifiedAwareCssResourceReference( DefaultAbstractTree.class, "res/tree-table.css"); private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/wicket/blob/99eec004/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java index 23a7e71..f3df167 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java @@ -20,6 +20,7 @@ import org.apache.wicket.AttributeModifier; import org.apache.wicket.Component; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.AjaxFallbackLink; +import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; @@ -33,7 +34,7 @@ import org.apache.wicket.request.IRequestHandler; import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler; import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.request.resource.ResourceReference; -import org.apache.wicket.markup.head.CssHeaderItem; +import org.apache.wicket.resource.MinifiedAwareCssResourceReference; /** * Rating component that generates a number of stars where a user can click on to rate something. @@ -323,7 +324,7 @@ public abstract class RatingPanel extends Panel super.renderHead(response); if (addDefaultCssStyle) { - response.render(CssHeaderItem.forReference(new PackageResourceReference( + response.render(CssHeaderItem.forReference(new MinifiedAwareCssResourceReference( RatingPanel.class, "RatingPanel.css"))); } http://git-wip-us.apache.org/repos/asf/wicket/blob/99eec004/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/Wizard.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/Wizard.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/Wizard.java index 1678768..cfaf51b 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/Wizard.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/Wizard.java @@ -18,14 +18,14 @@ package org.apache.wicket.extensions.wizard; import org.apache.wicket.Component; import org.apache.wicket.feedback.ContainerFeedbackMessageFilter; +import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.IFormSubmittingComponent; import org.apache.wicket.markup.html.panel.FeedbackPanel; import org.apache.wicket.markup.html.panel.Panel; -import org.apache.wicket.request.resource.PackageResourceReference; -import org.apache.wicket.markup.head.CssHeaderItem; +import org.apache.wicket.resource.MinifiedAwareCssResourceReference; /** @@ -114,7 +114,7 @@ public class Wizard extends Panel implements IWizardModelListener, IWizard * @param id * The component model * @param addDefaultCssStyle - * Whether to add the {@link #addDefaultCssStyle() default style} + * Whether to add the {@link #addDefaultCssStyle(org.apache.wicket.markup.head.IHeaderResponse) default style} */ public Wizard(final String id, final boolean addDefaultCssStyle) { @@ -149,7 +149,7 @@ public class Wizard extends Panel implements IWizardModelListener, IWizard * @param wizardModel * The transitions model * @param addDefaultCssStyle - * Whether to add the {@link #addDefaultCssStyle() default style} + * Whether to add the {@link #addDefaultCssStyle(org.apache.wicket.markup.head.IHeaderResponse) default style} */ public Wizard(final String id, final IWizardModel wizardModel, final boolean addDefaultCssStyle) { @@ -168,7 +168,7 @@ public class Wizard extends Panel implements IWizardModelListener, IWizard */ public void addDefaultCssStyle(final IHeaderResponse response) { - response.render(CssHeaderItem.forReference(new PackageResourceReference(Wizard.class, + response.render(CssHeaderItem.forReference(new MinifiedAwareCssResourceReference(Wizard.class, "Wizard.css"))); }
