You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2015/09/03 13:32:24 UTC
svn commit: r1700987 [2/2] - in
/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago:
component/ facelets/extension/ internal/component/ internal/layout/
internal/taglib/component/ internal/taglib/declaration/ inter...
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneChoiceExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneChoiceExtensionTag.java?rev=1700987&r1=1700986&r2=1700987&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneChoiceExtensionTag.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneChoiceExtensionTag.java Thu Sep 3 11:32:23 2015
@@ -27,8 +27,9 @@ import org.apache.myfaces.tobago.apt.ann
/**
* Render a single selection dropdown list with a label.
+ *
+ * @deprecated since Tobago 3.0. The tx-library is deprecated, please use the tc-library.
*/
-
@Tag(name = "selectOneChoice")
@ExtensionTag(
baseClassName = "org.apache.myfaces.tobago.internal.taglib.SelectOneChoiceTag",
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneListboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneListboxExtensionTag.java?rev=1700987&r1=1700986&r2=1700987&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneListboxExtensionTag.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneListboxExtensionTag.java Thu Sep 3 11:32:23 2015
@@ -27,6 +27,8 @@ import org.apache.myfaces.tobago.apt.ann
/**
* Render a single selection option listbox.
+ *
+ * @deprecated since Tobago 3.0. The tx-library is deprecated, please use the tc-library.
*/
@Tag(name = "selectOneListbox")
@ExtensionTag(
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneRadioExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneRadioExtensionTag.java?rev=1700987&r1=1700986&r2=1700987&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneRadioExtensionTag.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneRadioExtensionTag.java Thu Sep 3 11:32:23 2015
@@ -29,6 +29,8 @@ import org.apache.myfaces.tobago.apt.ann
* Render a set of radio buttons.
*
* @since 1.0.13
+ *
+ * @deprecated since Tobago 3.0. The tx-library is deprecated, please use the tc-library.
*/
@Tag(name = "selectOneRadio")
@ExtensionTag(
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SeparatorExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SeparatorExtensionTag.java?rev=1700987&r1=1700986&r2=1700987&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SeparatorExtensionTag.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SeparatorExtensionTag.java Thu Sep 3 11:32:23 2015
@@ -36,6 +36,8 @@ import org.apache.myfaces.tobago.apt.ann
* </f:facet>
* </tc:separator>
* </pre>
+ *
+ * @deprecated since Tobago 3.0. The tx-library is deprecated, please use the tc-library.
*/
@Tag(
name = "separator")
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TextareaExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TextareaExtensionTag.java?rev=1700987&r1=1700986&r2=1700987&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TextareaExtensionTag.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TextareaExtensionTag.java Thu Sep 3 11:32:23 2015
@@ -41,8 +41,9 @@ import org.apache.myfaces.tobago.apt.ann
* </tc:in>
* </tc:panel>
* </pre>
+ *
+ * @deprecated since Tobago 3.0. The tx-library is deprecated, please use the tc-library.
*/
-
@Tag(name = "textarea")
@ExtensionTag(
baseClassName = "org.apache.myfaces.tobago.internal.taglib.TextareaTag",
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.java?rev=1700987&r1=1700986&r2=1700987&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.java Thu Sep 3 11:32:23 2015
@@ -42,7 +42,7 @@ import org.apache.myfaces.tobago.apt.ann
* </tc:panel>
* </pre>
*
- * @deprecated use <tc:date> instead
+ * @deprecated since Tobago 3.0. The tx-library is deprecated, please use the tc-library. Use <tc:date> instead.
*/
@Deprecated
@Tag(name = "time")
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/package-info.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/package-info.java?rev=1700987&r1=1700986&r2=1700987&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/package-info.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/package-info.java Thu Sep 3 11:32:23 2015
@@ -18,11 +18,11 @@
*/
/**
- * <b>Tobago Framework Extension Tag Library 3.0.x -
+ * <b>Tobago Framework Extension Tag Library 3.0.x (deprecated) -
* (C) Copyright 2005-2015 The Apache Software Foundation</b>
*/
@org.apache.myfaces.tobago.apt.annotation.Taglib(
shortName = "tx",
uri = "http://myfaces.apache.org/tobago/extension",
name = "tobago-extension",
- displayName = "Tobago Extensions 3.0.x") package org.apache.myfaces.tobago.internal.taglib.extension;
+ displayName = "Tobago Extensions 3.0.x (deprecated)") package org.apache.myfaces.tobago.internal.taglib.extension;
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java?rev=1700987&r1=1700986&r2=1700987&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java Thu Sep 3 11:32:23 2015
@@ -137,14 +137,20 @@ public abstract class TobagoResponseWrit
* TBD: preliminary
*/
public void writeClassAttribute(final CssItem first, final CssItem... others) throws IOException {
- StringBuilder builder = new StringBuilder(first.getName());
+ StringBuilder builder = new StringBuilder();
+ if (first != null) {
+ builder.append(first.getName());
+ builder.append(' ');
+ }
for (CssItem other : others) {
if (other != null) {
- builder.append(' ');
builder.append(other.getName());
+ builder.append(' ');
}
}
- writeAttribute(HtmlAttributes.CLASS, builder.toString(), false);
+ if (builder.length() > 0) {
+ writeAttribute(HtmlAttributes.CLASS, builder.deleteCharAt(builder.length() - 1).toString(), false);
+ }
}
/**