myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject svn commit: r1239028 - in /myfaces/tobago: branches/tobago-tree-table/ branches/tobago-tree-table/src/site/apt/ branches/tobago-tree-table/src/site/resources/ branches/tobago-tree-table/src/site/resources/images/ branches/tobago-tree-table/tobago-theme...
Date Wed, 01 Feb 2012 09:49:37 GMT
Author: lofwyr
Date: Wed Feb  1 09:49:36 2012
New Revision: 1239028

URL: http://svn.apache.org/viewvc?rev=1239028&view=rev
Log:
merged against the trunk

Modified:
    myfaces/tobago/branches/tobago-tree-table/   (props changed)
    myfaces/tobago/branches/tobago-tree-table/pom.xml
    myfaces/tobago/branches/tobago-tree-table/src/site/apt/api-documentation.apt
    myfaces/tobago/branches/tobago-tree-table/src/site/apt/download.apt
    myfaces/tobago/branches/tobago-tree-table/src/site/apt/index.apt
    myfaces/tobago/branches/tobago-tree-table/src/site/apt/news.apt
    myfaces/tobago/branches/tobago-tree-table/src/site/apt/oldDocumentation.apt
    myfaces/tobago/branches/tobago-tree-table/src/site/resources/   (props changed)
    myfaces/tobago/branches/tobago-tree-table/src/site/resources/doap_tobago.rdf   (contents,
props changed)
    myfaces/tobago/branches/tobago-tree-table/src/site/resources/images/   (props changed)
    myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.java
    myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java
    myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
    myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TimeRenderer.java
    myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties
    myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css
    myfaces/tobago/trunk/tobago-core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-1.0.29.dtd
  (props changed)
    myfaces/tobago/trunk/tobago-core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-1.0.30.dtd
  (props changed)
    myfaces/tobago/trunk/tobago-core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-1.0.34.dtd
  (props changed)
    myfaces/tobago/trunk/tobago-core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-1.5.xsd
  (props changed)
    myfaces/tobago/trunk/tobago-core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config_1_0.dtd
  (props changed)

Propchange: myfaces/tobago/branches/tobago-tree-table/
------------------------------------------------------------------------------
    svn:mergeinfo = /myfaces/tobago/trunk:1226794-1239018

Modified: myfaces/tobago/branches/tobago-tree-table/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/pom.xml?rev=1239028&r1=1239027&r2=1239028&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/pom.xml Wed Feb  1 09:49:36 2012
@@ -26,7 +26,7 @@
   <artifactId>tobago</artifactId>
   <packaging>pom</packaging>
   <name>Apache Tobago</name>
-  <version>1.5.2-SNAPSHOT</version>
+  <version>1.5.3-SNAPSHOT</version>
   <description>The goal of Tobago is to provide the community with a well designed
set of user interface components based on JSF and run on MyFaces.</description>
   <prerequisites>
     <maven>2.2.1</maven>

Modified: myfaces/tobago/branches/tobago-tree-table/src/site/apt/api-documentation.apt
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/src/site/apt/api-documentation.apt?rev=1239028&r1=1239027&r2=1239028&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/src/site/apt/api-documentation.apt (original)
+++ myfaces/tobago/branches/tobago-tree-table/src/site/apt/api-documentation.apt Wed Feb 
1 09:49:36 2012
@@ -22,9 +22,9 @@ Tobago API and TLD Documentation
   {{{http://myfaces.apache.org/tobago/apidocs-1.0.38/index.html}1.0.38 Core API Documentation}}\
   {{{http://myfaces.apache.org/tobago/tobago-core/tlddoc-1.0.38/index.html}1.0.38 Tag Library
Documentation}}
 
-  {{{http://myfaces.apache.org/tobago/apidocs-1.5.1/index.html}1.5.1 API Documentation}}\
-  {{{http://myfaces.apache.org/tobago/tobago-core/tlddoc-1.5.1/index.html}1.5.1 \<tc:\>
Component Tag Library Documentation}}\
-  {{{http://myfaces.apache.org/tobago/tobago-extension/tobago-taglib-extension/tlddoc-1.5.1/index.html}1.5.1
\<tx:\> Extension Tag Library Documentation}}
+  {{{http://myfaces.apache.org/tobago/apidocs-1.5.2/index.html}1.5.2 API Documentation}}\
+  {{{http://myfaces.apache.org/tobago/tobago-core/tlddoc-1.5.2/index.html}1.5.2 \<tc:\>
Component Tag Library Documentation}}\
+  {{{http://myfaces.apache.org/tobago/tobago-extension/tobago-taglib-extension/tlddoc-1.5.2/index.html}1.5.2
\<tx:\> Extension Tag Library Documentation}}
 
   {{{http://myfaces.apache.org/tobago/apidocs/index.html}Latest 1.5.x SVN API Documentation}}\
   {{{http://myfaces.apache.org/tobago/tobago-core/tlddoc/index.html}Latest 1.5.x SVN \<tc:\>
Component Tag Library Documentation}}\

Modified: myfaces/tobago/branches/tobago-tree-table/src/site/apt/download.apt
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/src/site/apt/download.apt?rev=1239028&r1=1239027&r2=1239028&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/src/site/apt/download.apt (original)
+++ myfaces/tobago/branches/tobago-tree-table/src/site/apt/download.apt Wed Feb  1 09:49:36
2012
@@ -52,23 +52,23 @@ MyFaces Tobago 1.0.38 Distribution
 | MyFaces Tobago Example 1.0.38 (zip)      | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-tobago-1.0.38-example.zip}
myfaces-tobago-1.0.38-example.zip}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.0.38-example.zip.md5}
myfaces-tobago-1.0.38-example.zip.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.0.38-example.zip.asc}
myfaces-tobago-1.0.38-example.zip.asc}} |
 *-------------------------+---------+----------+-----------+
 
-MyFaces Tobago 1.5.1 Distribution
+MyFaces Tobago 1.5.2 Distribution
 
     Release notes can be found
-    {{{http://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310273&styleName=Html&version=12319154}here}}.
+    {{{http://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310273&styleName=Html&version=12319248}here}}.
 
 *-------------------------+---------+----------+-----------+
 |                         | Mirrors | Checksum | Signature |
 *-------------------------+---------+----------+-----------+
-| MyFaces Tobago 1.5.1 (tar.gz)     | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-tobago-1.5.1-dist.tar.gz}
myfaces-tobago-1.5.1-dist.tar.gz}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.5.1-dist.tar.gz.md5}
myfaces-tobago-1.5.1-dist.tar.gz.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.5.1-dist.tar.gz.asc}
myfaces-tobago-1.5.1-dist.tar.gz.asc}} |
+| MyFaces Tobago 1.5.2 (tar.gz)     | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-tobago-1.5.2-dist.tar.gz}
myfaces-tobago-1.5.2-dist.tar.gz}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.5.2-dist.tar.gz.md5}
myfaces-tobago-1.5.2-dist.tar.gz.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.5.2-dist.tar.gz.asc}
myfaces-tobago-1.5.2-dist.tar.gz.asc}} |
 *-------------------------+---------+----------+-----------+
-| MyFaces Tobago 1.5.1 (zip)      | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-tobago-1.5.1-dist.zip}
myfaces-tobago-1.5.1-dist.zip}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.5.1-dist.zip.md5}
myfaces-tobago-1.5.1-dist.zip.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.5.1-dist.zip.asc}
myfaces-tobago-1.5.1-dist.zip.asc}} |
+| MyFaces Tobago 1.5.2 (zip)      | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-tobago-1.5.2-dist.zip}
myfaces-tobago-1.5.2-dist.zip}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.5.2-dist.zip.md5}
myfaces-tobago-1.5.2-dist.zip.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.5.2-dist.zip.asc}
myfaces-tobago-1.5.2-dist.zip.asc}} |
 *-------------------------+---------+----------+-----------+
-| MyFaces Tobago Source 1.5.1 (zip)      | {{{http://www.apache.org/dyn/closer.cgi/myfaces/source/myfaces-tobago-1.5.1-source-release.zip}
myfaces-tobago-1.5.1-source-release.zip}} | {{{http://www.apache.org/dist/myfaces/source/myfaces-tobago-1.5.1-source-release.zip.md5}
myfaces-tobago-1.5.1-source-release.zip.md5}} | {{{http://www.apache.org/dist/myfaces/source/myfaces-tobago-1.5.1-source-release.zip.asc}
myfaces-tobago-1.5.1-source-release.zip.asc}} |
+| MyFaces Tobago Source 1.5.2 (zip)      | {{{http://www.apache.org/dyn/closer.cgi/myfaces/source/myfaces-tobago-1.5.2-source-release.zip}
myfaces-tobago-1.5.2-source-release.zip}} | {{{http://www.apache.org/dist/myfaces/source/myfaces-tobago-1.5.2-source-release.zip.md5}
myfaces-tobago-1.5.2-source-release.zip.md5}} | {{{http://www.apache.org/dist/myfaces/source/myfaces-tobago-1.5.2-source-release.zip.asc}
myfaces-tobago-1.5.2-source-release.zip.asc}} |
 *-------------------------+---------+----------+-----------+
-| MyFaces Tobago Example 1.5.1 (tar.gz)     | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-tobago-1.5.1-example.tar.gz}
myfaces-tobago-1.5.1-example.tar.gz}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.5.1-example.tar.gz.md5}
myfaces-tobago-1.5.1-example.tar.gz.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.5.1-example.tar.gz.asc}
myfaces-tobago-1.5.1-example.tar.gz.asc}} |
+| MyFaces Tobago Example 1.5.2 (tar.gz)     | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-tobago-1.5.2-example.tar.gz}
myfaces-tobago-1.5.2-example.tar.gz}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.5.2-example.tar.gz.md5}
myfaces-tobago-1.5.2-example.tar.gz.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.5.2-example.tar.gz.asc}
myfaces-tobago-1.5.2-example.tar.gz.asc}} |
 *-------------------------+---------+----------+-----------+
-| MyFaces Tobago Example 1.5.1 (zip)      | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-tobago-1.5.1-example.zip}
myfaces-tobago-1.5.1-example.zip}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.5.1-example.zip.md5}
myfaces-tobago-1.5.1-example.zip.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.5.1-example.zip.asc}
myfaces-tobago-1.5.1-example.zip.asc}} |
+| MyFaces Tobago Example 1.5.2 (zip)      | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-tobago-1.5.2-example.zip}
myfaces-tobago-1.5.2-example.zip}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.5.2-example.zip.md5}
myfaces-tobago-1.5.2-example.zip.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.5.2-example.zip.asc}
myfaces-tobago-1.5.2-example.zip.asc}} |
 *-------------------------+---------+----------+-----------+
 
 

Modified: myfaces/tobago/branches/tobago-tree-table/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/src/site/apt/index.apt?rev=1239028&r1=1239027&r2=1239028&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/src/site/apt/index.apt (original)
+++ myfaces/tobago/branches/tobago-tree-table/src/site/apt/index.apt Wed Feb  1 09:49:36 2012
@@ -49,6 +49,8 @@ News
 
   []
 
+    * <<24-01-12>> - Apache MyFaces Tobago 1.5.2 released!
+
     * <<12-12-11>> - Apache MyFaces Tobago 1.5.1 released!
 
     * <<30-11-11>> - Apache MyFaces Tobago 1.5.0 released!

Modified: myfaces/tobago/branches/tobago-tree-table/src/site/apt/news.apt
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/src/site/apt/news.apt?rev=1239028&r1=1239027&r2=1239028&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/src/site/apt/news.apt (original)
+++ myfaces/tobago/branches/tobago-tree-table/src/site/apt/news.apt Wed Feb  1 09:49:36 2012
@@ -13,6 +13,12 @@
  ~~ See the License for the specific language governing permissions and
  ~~ limitations under the License.
 
+January 24, 2012 - MyFaces Tobago 1.5.2 Released
+
+    The MyFaces Tobago component library in version 1.5.2 has been released.
+
+    Release notes can be found
+    {{{http://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310273&styleName=Html&version=12319248}here}}.
 
 December 12, 2011 - MyFaces Tobago 1.5.1 Released
 

Modified: myfaces/tobago/branches/tobago-tree-table/src/site/apt/oldDocumentation.apt
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/src/site/apt/oldDocumentation.apt?rev=1239028&r1=1239027&r2=1239028&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/src/site/apt/oldDocumentation.apt (original)
+++ myfaces/tobago/branches/tobago-tree-table/src/site/apt/oldDocumentation.apt Wed Feb  1
09:49:36 2012
@@ -19,6 +19,8 @@
 
 Tobago Javadoc Documentation
 
+  {{{http://myfaces.apache.org/tobago/apidocs-1.5.2/index.html}1.5.2 API Documentation}}
+
   {{{http://myfaces.apache.org/tobago/apidocs-1.5.1/index.html}1.5.1 API Documentation}}
 
   {{{http://myfaces.apache.org/tobago/apidocs-1.5.0/index.html}1.5.0 API Documentation}}
@@ -89,6 +91,9 @@ Tobago Javadoc Documentation
 
 Tobago TLD Documentation
 
+  {{{http://myfaces.apache.org/tobago/tobago-core/tlddoc-1.5.2/index.html}1.5.2 \<tc:\>
Component Tag Library Documentation}}\
+  {{{http://myfaces.apache.org/tobago/tobago-extension/tobago-taglib-extension/tlddoc-1.5.2/index.html}1.5.2
\<tx:\> Extension Tag Library Documentation}}
+
   {{{http://myfaces.apache.org/tobago/tobago-core/tlddoc-1.5.1/index.html}1.5.1 \<tc:\>
Component Tag Library Documentation}}\
   {{{http://myfaces.apache.org/tobago/tobago-extension/tobago-taglib-extension/tlddoc-1.5.1/index.html}1.5.1
\<tx:\> Extension Tag Library Documentation}}
 

Propchange: myfaces/tobago/branches/tobago-tree-table/src/site/resources/
------------------------------------------------------------------------------
    svn:mergeinfo = /myfaces/tobago/trunk/src/site/resources:1226794-1239018*

Modified: myfaces/tobago/branches/tobago-tree-table/src/site/resources/doap_tobago.rdf
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/src/site/resources/doap_tobago.rdf?rev=1239028&r1=1239027&r2=1239028&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/src/site/resources/doap_tobago.rdf (original)
+++ myfaces/tobago/branches/tobago-tree-table/src/site/resources/doap_tobago.rdf Wed Feb 
1 09:49:36 2012
@@ -37,11 +37,20 @@
     <category rdf:resource="http://projects.apache.org/category/web-framework" />
     <release>
       <Version>
-        <name>Latest stable release</name>
-        <created>2011-07-14</created>
-        <revision>1.0.37</revision>
-        <file-release>http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-tobago-1.0.37-dist.tar.gz</file-release>
-        <file-release>http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-tobago-1.0.37-dist.zip</file-release>
+        <name>Latest stable release of 1.0.x</name>
+        <created>2011-10-23</created>
+        <revision>1.0.38</revision>
+        <file-release>http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-tobago-1.0.38-dist.tar.gz</file-release>
+        <file-release>http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-tobago-1.0.38-dist.zip</file-release>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>Latest stable release of 1.5.x</name>
+        <created>2012-01-24</created>
+        <revision>1.5.2</revision>
+        <file-release>http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-tobago-1.5.2-dist.tar.gz</file-release>
+        <file-release>http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-tobago-1.5.2-dist.zip</file-release>
       </Version>
     </release>
     <repository>

Propchange: myfaces/tobago/branches/tobago-tree-table/src/site/resources/doap_tobago.rdf
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Feb  1 09:49:36 2012
@@ -0,0 +1 @@
+/myfaces/tobago/trunk/src/site/resources/doap_tobago.rdf:1226794-1239018

Propchange: myfaces/tobago/branches/tobago-tree-table/src/site/resources/images/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Feb  1 09:49:36 2012
@@ -0,0 +1 @@
+/myfaces/tobago/trunk/src/site/resources/images:1226794-1239018

Modified: myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.java?rev=1239028&r1=1239027&r2=1239028&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.java
(original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.java
Wed Feb  1 09:49:36 2012
@@ -20,8 +20,6 @@ package org.apache.myfaces.tobago.render
 import org.apache.myfaces.tobago.component.UILabel;
 import org.apache.myfaces.tobago.context.Markup;
 import org.apache.myfaces.tobago.internal.util.AccessKeyMap;
-import org.apache.myfaces.tobago.internal.util.Deprecation;
-import org.apache.myfaces.tobago.layout.LayoutBase;
 import org.apache.myfaces.tobago.renderkit.LabelWithAccessKey;
 import org.apache.myfaces.tobago.renderkit.LayoutComponentRendererBase;
 import org.apache.myfaces.tobago.renderkit.css.Classes;
@@ -60,44 +58,44 @@ public class LabelRenderer extends Layou
 
   public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException
{
 
-    // todo: remove test after 1.5.0, then UILabel is required
-    if (!(component instanceof UILabel)) {
-      Deprecation.LOG.warn("LabelRenderer should only render UILabel but got " + component.getClass().getName()
-          + " id=" + component.getClientId(facesContext));
-    }
+    UILabel label = (UILabel) component;
     TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
 
-    LabelWithAccessKey label = new LabelWithAccessKey(component);
-
-    String forValue = ComponentUtils.findClientIdFor(component, facesContext);
+    String forValue = ComponentUtils.findClientIdFor(label, facesContext);
 
-    String clientId = component.getClientId(facesContext);
-    writer.startElement(HtmlElements.LABEL, component);
-    HtmlRendererUtils.renderDojoDndItem(component, writer, true);
-    final Classes classes = Classes.create(component);
+    String clientId = label.getClientId(facesContext);
+    writer.startElement(HtmlElements.LABEL, label);
+    HtmlRendererUtils.renderDojoDndItem(label, writer, true);
+    final Classes classes = Classes.create(label);
     writer.writeClassAttribute(classes);
-    if (component instanceof LayoutBase) {
-      Style style = new Style(facesContext, (LayoutBase) component);
-      writer.writeStyleAttribute(style);
-    }
+    writer.writeStyleAttribute(new Style(facesContext, label));
     writer.writeIdAttribute(clientId);
     if (forValue != null) {
       writer.writeAttribute(HtmlAttributes.FOR, forValue, false);
     }
+    HtmlRendererUtils.renderTip(label, writer);
 
-    HtmlRendererUtils.renderTip(component, writer);
+    encodeTextContent(facesContext, writer, label);
 
-    if (label.getText() != null) {
-      HtmlRendererUtils.writeLabelWithAccessKey(writer, label);
-    }
+    writer.endElement(HtmlElements.LABEL);
+  }
 
-    if (label.getAccessKey() != null) {
+  /** Encodes the text inside of the label. 
+   * Can be overwritten in other themes.
+   */
+  protected void encodeTextContent(FacesContext facesContext, TobagoResponseWriter writer,
UILabel label) 
+      throws IOException {
+    String clientId = label.getClientId(facesContext);
+    LabelWithAccessKey key = new LabelWithAccessKey(label);
+    if (key.getText() != null) {
+      HtmlRendererUtils.writeLabelWithAccessKey(writer, key);
+    }
+    if (key.getAccessKey() != null) {
       if (LOG.isInfoEnabled()
-          && !AccessKeyMap.addAccessKey(facesContext, label.getAccessKey())) {
-        LOG.info("dublicated accessKey : " + label.getAccessKey());
+          && !AccessKeyMap.addAccessKey(facesContext, key.getAccessKey())) {
+        LOG.info("Duplicated accessKey : " + key.getAccessKey());
       }
-      HtmlRendererUtils.addClickAcceleratorKey(facesContext, clientId, label.getAccessKey());
+      HtmlRendererUtils.addClickAcceleratorKey(facesContext, clientId, key.getAccessKey());
     }
-    writer.endElement(HtmlElements.LABEL);
   }
 }

Modified: myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java?rev=1239028&r1=1239027&r2=1239028&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java
(original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java
Wed Feb  1 09:49:36 2012
@@ -190,11 +190,8 @@ public class PageRenderer extends PageRe
 
       writer.startElement(HtmlElements.HEAD, null);
 
-      if (debugMode) {
-        writer.writeJavascript("var TbgHeadStart = new Date();");
-      }
+      // meta tags
 
-      // meta
       // this is needed, because websphere 6.0? ignores the setting of the content type on
the response
       writer.startElement(HtmlElements.META, null);
       writer.writeAttribute(HtmlAttributes.HTTP_EQUIV, "Content-Type", false);
@@ -207,6 +204,12 @@ public class PageRenderer extends PageRe
       writer.endElement(HtmlElements.TITLE);
       final Theme theme = client.getTheme();
 
+      if (debugMode) {
+        // This tag must not be earlier, because the
+        // IE doesn't accept some META tags, when they are not the first ones.
+        writer.writeJavascript("var TbgHeadStart = new Date();");
+      }
+
       // style files
       for (String styleFile : theme.getStyleResources(productionMode)) {
         writeStyle(facesContext, writer, styleFile);

Modified: myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java?rev=1239028&r1=1239027&r2=1239028&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
(original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
Wed Feb  1 09:49:36 2012
@@ -244,9 +244,12 @@ public class SheetRenderer extends Layou
     bodyStyle.setHeight(null);
     bodyStyle.setTop(null);
     Style sheetBodyStyle = new Style(bodyStyle);
-    final boolean needVerticalScrollbar = needVerticalScrollbar(facesContext, sheet, style);
-    if (needVerticalScrollbar) {
-      tableBodyWidth = tableBodyWidth.subtractNotNegative(getVerticalScrollbarWeight(facesContext,
sheet));
+    if (sheet.getNeedVerticalScrollbar() == null) {
+      LOG.warn("Value of needVerticalScrollbar undefined!"); // why this value isn't set
by the layout manager?
+    } else {
+      if (sheet.getNeedVerticalScrollbar()) {
+        tableBodyWidth = tableBodyWidth.subtractNotNegative(getVerticalScrollbarWeight(facesContext,
sheet));
+      }
     }
     sheetBodyStyle.setWidth(tableBodyWidth);
 
@@ -264,6 +267,10 @@ public class SheetRenderer extends Layou
         writer.writeAttribute(HtmlAttributes.WIDTH, columnWidth);
         writer.endElement(HtmlElements.COL);
       }
+      // filler column, which normally is not seen, it appears when resizing the columns
+//      writer.startElement(HtmlElements.COL, null);
+//      writer.writeAttribute(HtmlAttributes.WIDTH, 0);
+//      writer.endElement(HtmlElements.COL);
       writer.endElement(HtmlElements.COLGROUP);
     }
 
@@ -370,8 +377,10 @@ public class SheetRenderer extends Layou
       }
 
       writer.startElement(HtmlElements.TD, null);
-      writer.writeClassAttribute(Classes.create(sheet, "cell"));
-      writer.write("&nbsp;");
+      writer.writeClassAttribute(Classes.create(sheet, "cell", Markup.FILLER));
+//      writer.write("&nbsp;");
+      writer.startElement(HtmlElements.DIV, null);
+      writer.endElement(HtmlElements.DIV);
       writer.endElement(HtmlElements.TD);
 
       writer.endElement(HtmlElements.TR);
@@ -394,8 +403,10 @@ public class SheetRenderer extends Layou
         writer.endElement(HtmlElements.TD);
       }
       writer.startElement(HtmlElements.TD, null);
-      writer.writeClassAttribute(Classes.create(sheet, "cell"));
-      writer.write("&nbsp;");
+      writer.writeClassAttribute(Classes.create(sheet, "cell", Markup.FILLER));
+//      writer.write("&nbsp;");
+      writer.startElement(HtmlElements.DIV, null);
+      writer.endElement(HtmlElements.DIV);
       writer.endElement(HtmlElements.TD);
       writer.endElement(HtmlElements.TR);
     }
@@ -413,7 +424,6 @@ public class SheetRenderer extends Layou
     if (sheet.isPagingVisible()) {
       Style footerStyle = new Style();
       footerStyle.setWidth(sheet.getCurrentWidth());
-      footerStyle.setHeight(footerHeight);
       if (ie6SelectOneFix) {
         footerStyle.setTop(headerHeight);
       }
@@ -582,40 +592,6 @@ public class SheetRenderer extends Layou
 
   }
 
-  private boolean needVerticalScrollbar(FacesContext facesContext, UISheet sheet, Style style)
{
-    // estimate need of height-scrollbar on client, if yes we have to consider
-    // this when calculating column width's
-
-    final Object forceScrollbar = sheet.getAttributes().get(Attributes.FORCE_VERTICAL_SCROLLBAR);
-    if (forceScrollbar != null) {
-      if ("true".equals(forceScrollbar)) {
-        return true;
-      } else if ("false".equals(forceScrollbar)) {
-        return false;
-      } else if (!"auto".equals(forceScrollbar)) {
-        LOG.warn("Illegal value for attribute 'forceVerticalScrollbar': '" + forceScrollbar
+ "'");
-      }
-    }
-
-    if (!sheet.hasRowCount()) {
-      return true;
-    }
-
-    if (style.getHeight() != null) {
-      int first = sheet.getFirst();
-      int rows = sheet.hasRows()
-          ? Math.min(sheet.getRowCount(), first + sheet.getRows()) - first
-          : sheet.getRowCount();
-      final Measure rowPadding = getCustomMeasure(facesContext, sheet, "rowPadding");
-      Measure heightNeeded = getFooterHeight(facesContext, sheet)
-              .add(rowPadding.add(20/*fixme*/).multiply(rows))
-              .add(20); // FIXME: make dynamic (was removed by changing the layouting
-      return heightNeeded.greaterThan(style.getHeight());
-    } else {
-      return false;
-    }
-  }
-
   private Measure getHeaderHeight(FacesContext facesContext, UISheet sheet) {
     return sheet.isShowHeader()
         ? getResourceManager().getThemeMeasure(facesContext, sheet, "headerHeight")
@@ -1010,6 +986,12 @@ public class SheetRenderer extends Layou
     Measure rowHeight = getRowHeight(facesContext, sheet);
     Measure footerHeight = getFooterHeight(facesContext, sheet);
     int rows = sheet.getRows();
+    if (rows == 0) {
+      rows = sheet.getRowCount();
+    }
+    if (rows == -1) {
+      rows = 10; // estimating something to get a valid value...
+    }
 
     if (LOG.isDebugEnabled()) {
       LOG.debug(headerHeight + " " + footerHeight + " " + rowHeight + " " + rows);

Modified: myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TimeRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TimeRenderer.java?rev=1239028&r1=1239027&r2=1239028&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TimeRenderer.java
(original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TimeRenderer.java
Wed Feb  1 09:49:36 2012
@@ -104,10 +104,12 @@ public class TimeRenderer extends InputR
 
     writer.startElement(HtmlElements.DIV, time);
     writer.writeAttribute(HtmlAttributes.ID, idPrefix + "borderDiv", false);
-    final Markup markup = hasSeconds ? Markup.valueOf("seconds") : null;
+    Markup markup = time.getCurrentMarkup();
+    if (hasSeconds) {
+      markup = markup.add(Markup.SECONDS);
+    }
     writer.writeClassAttribute(Classes.create(time, "borderDiv", markup));
 
-
     writeInput(writer, time, idPrefix + "hour", hour, true, title);
     writeInputSeparator(writer, time, ":");
     writeInput(writer, time, idPrefix + "minute", minute, false, title);

Modified: myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties?rev=1239028&r1=1239027&r2=1239028&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties
(original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties
Wed Feb  1 09:49:36 2012
@@ -169,7 +169,7 @@ Separator.withoutLabelHeight=2
 
 Sheet.headerHeight=20
 Sheet.footerHeight=20
-Sheet.rowHeight=18
+Sheet.rowHeight=20
 Sheet.rowPadding=5
 Sheet.selectorMenuWidth=20
 Sheet.cellPaddingWidth=4

Modified: myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css?rev=1239028&r1=1239027&r2=1239028&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css
(original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css
Wed Feb  1 09:49:36 2012
@@ -716,7 +716,6 @@ li.tobago-menu-markup-selected {
   border-color: #ff0000;
 }
 
-
 /* selectManyShuttle ----------------------------------------------------------- */
 
 .tobago-selectManyShuttle {
@@ -946,15 +945,22 @@ hr.tobago-separator {
 }
 
 .tobago-sheet-cell {
-  padding: 2px;
+  padding: 3px 2px;
   vertical-align: top;
   overflow: hidden;
+  line-height: 14px;
 }
 
+
 .tobago-sheet-cell-markup-clickable {
    cursor: pointer;
 }
 
+.tobago-sheet-cell-markup-filler {
+  padding-left: 0;
+  padding-right: 0;
+}
+
 .tobago-sheet-cell-markup-pure {
   padding: 0;
 }
@@ -976,6 +982,7 @@ hr.tobago-separator {
   position: relative;
   left: 0;
   top: 0;
+  height: 20px;
   text-align: center;
   overflow: hidden;
 }
@@ -1290,7 +1297,7 @@ div.tobago-richTextEditor-body {
 
 .tobago-time-borderDiv {
   border: 2px inset #bbccdd;
-  background: white;
+  background-color: white;
   height: 21px;
   width: 58px;
   position: absolute;
@@ -1302,18 +1309,28 @@ div.tobago-richTextEditor-body {
   width: 87px;
 }
 
+.tobago-time-borderDiv-markup-readonly {
+  background: #bbccdd;
+}
+
+.tobago-time-borderDiv-markup-disabled {
+  color: #778899;
+  background: #bbccdd;
+}
+
 .tobago-time-input {
   font-family: arial, helvetica, sans-serif;
   font-size: 16px;
   height: 15px;
   width: 22px;
-  border: 1px solid white;
-  background: white;
+  border-width: 0;
+  padding: 2px 0;
+  background-color: transparent;
   text-align: center;
 }
 
 .tobago-time-input-markup-selected {
-  border: 1px solid yellow;
+  background-color: #fafad2;
 }
 
 .tobago-time-sep {

Propchange: myfaces/tobago/trunk/tobago-core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-1.0.29.dtd
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Feb  1 09:49:36 2012
@@ -0,0 +1,2 @@
+/incubator/tobago/trunk/src/site/resources/tobago-config-1.0.29.dtd:345942-394425
+/myfaces/tobago/trunk/src/site/resources/tobago-config-1.0.29.dtd:1226794-1239018

Propchange: myfaces/tobago/trunk/tobago-core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-1.0.30.dtd
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Feb  1 09:49:36 2012
@@ -0,0 +1,2 @@
+/incubator/tobago/trunk/src/site/resources/tobago-config-1.0.30.dtd:345942-394425
+/myfaces/tobago/trunk/src/site/resources/tobago-config-1.0.30.dtd:1226794-1239018

Propchange: myfaces/tobago/trunk/tobago-core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-1.0.34.dtd
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Feb  1 09:49:36 2012
@@ -0,0 +1,2 @@
+/incubator/tobago/trunk/src/site/resources/tobago-config-1.0.34.dtd:345942-394425
+/myfaces/tobago/trunk/src/site/resources/tobago-config-1.0.34.dtd:1226794-1239018

Propchange: myfaces/tobago/trunk/tobago-core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-1.5.xsd
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Feb  1 09:49:36 2012
@@ -0,0 +1,2 @@
+/incubator/tobago/trunk/src/site/resources/tobago-config-1.5.xsd:345942-394425
+/myfaces/tobago/trunk/src/site/resources/tobago-config-1.5.xsd:1226794-1239018

Propchange: myfaces/tobago/trunk/tobago-core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config_1_0.dtd
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Feb  1 09:49:36 2012
@@ -0,0 +1,2 @@
+/incubator/tobago/trunk/src/site/resources/tobago-config_1_0.dtd:345942-394425
+/myfaces/tobago/trunk/src/site/resources/tobago-config_1_0.dtd:1226794-1239018



Mime
View raw message