You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2013/03/15 00:09:18 UTC
[13/14] git commit: Remove deprecated methods from StylesheetOptions
Remove deprecated methods from StylesheetOptions
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/fd09dff9
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/fd09dff9
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/fd09dff9
Branch: refs/heads/master
Commit: fd09dff9ce2b1d685d867f473feefc2a0145ed12
Parents: 58ad224
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Thu Mar 14 16:03:20 2013 -0700
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Thu Mar 14 16:03:20 2013 -0700
----------------------------------------------------------------------
.../services/javascript/StylesheetLink.java | 5 +--
.../services/javascript/StylesheetOptions.java | 23 ---------------
2 files changed, 2 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/fd09dff9/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StylesheetLink.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StylesheetLink.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StylesheetLink.java
index 2f6d66a..d45ba1f 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StylesheetLink.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StylesheetLink.java
@@ -93,12 +93,11 @@ public final class StylesheetLink
*/
public void add(Element container)
{
- String condition = options.getCondition();
- boolean hasCondition = InternalUtils.isNonBlank(condition);
+ boolean hasCondition = InternalUtils.isNonBlank(options.condition);
if (hasCondition)
{
- container.raw(String.format("\n<!--[if %s]>\n", condition));
+ container.raw(String.format("\n<!--[if %s]>\n", options.condition));
}
String rel = options.ajaxInsertionPoint ? "stylesheet t-ajax-insertion-point" : "stylesheet";
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/fd09dff9/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StylesheetOptions.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StylesheetOptions.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StylesheetOptions.java
index 5755cb0..f03140f 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StylesheetOptions.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StylesheetOptions.java
@@ -90,29 +90,6 @@ public final class StylesheetOptions
return new StylesheetOptions(media, condition, true);
}
- /**
- * The media associated with this stylesheet, i.e., "print". Becomes the media attribute
- * of the <link> tag. May be null.
- *
- * @deprecated in 5.3, may be removed in a later release, use the {@link #media} field instead
- */
- public String getMedia()
- {
- return media;
- }
-
- /**
- * The Internet Explorer condition associated with the link. When non-blank, the
- * <link> element will be written inside a specially formatted comment interpreted
- * by Internet Explorer. Usually null.
- *
- * @see <a href="http://en.wikipedia.org/wiki/Conditional_comment">http://en.wikipedia.org/wiki/Conditional_comment</a>
- * @deprecated in 5.3, may be removed in a later release, use the {@link #condition} field instead
- */
- public String getCondition()
- {
- return condition;
- }
@Override
public String toString()