This is an automated email from the ASF dual-hosted git repository.
papegaaij pushed a commit to branch csp
in repository https://gitbox.apache.org/repos/asf/wicket.git
The following commit(s) were added to refs/heads/csp by this push:
new bd7f7ed WICKET-6725: renamed wicket-base.css to wicket-core.css
bd7f7ed is described below
commit bd7f7ed8304d70c7908265374fd1910de76245dd
Author: Emond Papegaaij <[email protected]>
AuthorDate: Tue Jan 14 20:08:11 2020 +0100
WICKET-6725: renamed wicket-base.css to wicket-core.css
---
wicket-core/src/main/java/org/apache/wicket/Page.java | 4 ++--
...erence.java => WicketCoreCSSResourceReference.java} | 10 +++++-----
.../wicket/css/{wicket-base.css => wicket-core.css} | 0
.../org/apache/wicket/settings/ResourceSettings.java | 18 +++++++++---------
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/wicket-core/src/main/java/org/apache/wicket/Page.java
b/wicket-core/src/main/java/org/apache/wicket/Page.java
index 3d70ad8..14ec901 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Page.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Page.java
@@ -24,7 +24,7 @@ import java.util.Set;
import org.apache.wicket.authorization.UnauthorizedActionException;
import org.apache.wicket.core.util.lang.WicketObjects;
-import org.apache.wicket.css.WicketBaseCSSResourceReference;
+import org.apache.wicket.css.WicketCoreCSSResourceReference;
import org.apache.wicket.feedback.FeedbackDelay;
import org.apache.wicket.markup.MarkupException;
import org.apache.wicket.markup.MarkupStream;
@@ -1011,7 +1011,7 @@ public abstract class Page extends MarkupContainer
{
super.renderHead(response);
response.render(
-
CssHeaderItem.forReference(getApplication().getResourceSettings().getWicketBaseCSS()));
+
CssHeaderItem.forReference(getApplication().getResourceSettings().getWicketCoreCSS()));
}
/**
diff --git
a/wicket-core/src/main/java/org/apache/wicket/css/WicketBaseCSSResourceReference.java
b/wicket-core/src/main/java/org/apache/wicket/css/WicketCoreCSSResourceReference.java
similarity index 75%
rename from
wicket-core/src/main/java/org/apache/wicket/css/WicketBaseCSSResourceReference.java
rename to
wicket-core/src/main/java/org/apache/wicket/css/WicketCoreCSSResourceReference.java
index 9247216..0134681 100644
---
a/wicket-core/src/main/java/org/apache/wicket/css/WicketBaseCSSResourceReference.java
+++
b/wicket-core/src/main/java/org/apache/wicket/css/WicketCoreCSSResourceReference.java
@@ -18,19 +18,19 @@ package org.apache.wicket.css;
import org.apache.wicket.request.resource.CssResourceReference;
-public final class WicketBaseCSSResourceReference extends CssResourceReference
+public final class WicketCoreCSSResourceReference extends CssResourceReference
{
private static final long serialVersionUID = 6795863553105608280L;
- private static final WicketBaseCSSResourceReference INSTANCE = new
WicketBaseCSSResourceReference();
+ private static final WicketCoreCSSResourceReference INSTANCE = new
WicketCoreCSSResourceReference();
- public static WicketBaseCSSResourceReference get()
+ public static WicketCoreCSSResourceReference get()
{
return INSTANCE;
}
- private WicketBaseCSSResourceReference()
+ private WicketCoreCSSResourceReference()
{
- super(WicketBaseCSSResourceReference.class, "wicket-base.css");
+ super(WicketCoreCSSResourceReference.class, "wicket-core.css");
}
}
diff --git a/wicket-core/src/main/java/org/apache/wicket/css/wicket-base.css
b/wicket-core/src/main/java/org/apache/wicket/css/wicket-core.css
similarity index 100%
rename from wicket-core/src/main/java/org/apache/wicket/css/wicket-base.css
rename to wicket-core/src/main/java/org/apache/wicket/css/wicket-core.css
diff --git
a/wicket-core/src/main/java/org/apache/wicket/settings/ResourceSettings.java
b/wicket-core/src/main/java/org/apache/wicket/settings/ResourceSettings.java
index 68317f4..dc227ca 100644
--- a/wicket-core/src/main/java/org/apache/wicket/settings/ResourceSettings.java
+++ b/wicket-core/src/main/java/org/apache/wicket/settings/ResourceSettings.java
@@ -29,7 +29,7 @@ import
org.apache.wicket.core.util.resource.locator.IResourceStreamLocator;
import org.apache.wicket.core.util.resource.locator.ResourceStreamLocator;
import
org.apache.wicket.core.util.resource.locator.caching.CachingResourceStreamLocator;
import org.apache.wicket.css.ICssCompressor;
-import org.apache.wicket.css.WicketBaseCSSResourceReference;
+import org.apache.wicket.css.WicketCoreCSSResourceReference;
import org.apache.wicket.javascript.IJavaScriptCompressor;
import org.apache.wicket.markup.head.PriorityFirstComparator;
import org.apache.wicket.markup.head.ResourceAggregator.RecordedHeaderItem;
@@ -175,7 +175,7 @@ public class ResourceSettings implements
IPropertiesFactoryContext
private boolean encodeJSessionId = false;
- private CssResourceReference wicketBaseCSS =
WicketBaseCSSResourceReference.get();
+ private CssResourceReference wicketCoreCSS =
WicketCoreCSSResourceReference.get();
/**
* Configures Wicket's default ResourceLoaders.<br>
@@ -776,29 +776,29 @@ public class ResourceSettings implements
IPropertiesFactoryContext
}
/**
- * Returns the resource reference of the base stylesheet for Wicket.
This stylesheet contains
+ * Returns the resource reference of the core stylesheet for Wicket.
This stylesheet contains
* some lowlevel styling used by Wicket.
*
* @return The resource reference of the base stylesheet for Wicket.
*/
- public CssResourceReference getWicketBaseCSS()
+ public CssResourceReference getWicketCoreCSS()
{
- return wicketBaseCSS;
+ return wicketCoreCSS;
}
/**
- * Replaces the base stylesheet for Wicket. Changes made to the styling
can break functionality
+ * Replaces the core stylesheet for Wicket. Changes made to the styling
can break functionality
* like {@link Component#setOutputMarkupPlaceholderTag(boolean)},
causing components that should
* not be visible to be displayed. Make sure the replacement stylesheet
has matching definitions
* for the corresponding sections in the Wicket version.
*
- * @param wicketBaseCSS
+ * @param wicketCoreCSS
* The replacement styleheet.
* @return {@code this} object for chaining
*/
- public ResourceSettings setWicketBaseCSS(CssResourceReference
wicketBaseCSS)
+ public ResourceSettings setWicketCoreCSS(CssResourceReference
wicketCoreCSS)
{
- this.wicketBaseCSS = wicketBaseCSS;
+ this.wicketCoreCSS = wicketCoreCSS;
return this;
}
}
