myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject svn commit: r803042 - in /myfaces/tobago/trunk: core/src/main/java/org/apache/myfaces/tobago/ core/src/main/java/org/apache/myfaces/tobago/component/ core/src/main/java/org/apache/myfaces/tobago/taglib/component/ core/src/main/java/org/apache/myfaces/t...
Date Tue, 11 Aug 2009 09:33:05 GMT
Author: lofwyr
Date: Tue Aug 11 09:32:58 2009
New Revision: 803042

URL: http://svn.apache.org/viewvc?rev=803042&view=rev
Log:
TOBAGO-606: Layout-Manager
 - clean up class names because of naming conventions: command
 - setting preferences for "date" and "time" 
 

Added:
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUICommand.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIToolBarCommand.java
      - copied, changed from r802804, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUICommand.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UICommandBase.java
  (contents, props changed)
      - copied, changed from r802804, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUICommand.java
Modified:
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/TobagoConstants.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIButton.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITreeNode.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIDatePicker.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ButtonTagDeclaration.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/CommandTagDeclaration.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/DatePickerTagDeclaration.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/LinkTagDeclaration.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarCommandTagDeclaration.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasCommandType.java
    myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericComponentTagUnitTest.java
    myfaces/tobago/trunk/extension/security/src/main/java/org/apache/myfaces/tobago/security/UISecuredLinkCommand.java
    myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/MenuCheckboxExtensionTag.java
    myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/MenuRadioExtensionTag.java
    myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/MenuCheckboxExtensionTag.java
    myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/MenuRadioExtensionTag.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ButtonRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LinkRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/RichTextEditorRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties
    myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties
    myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/CommandRendererHelper.java

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/TobagoConstants.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/TobagoConstants.java?rev=803042&r1=803041&r2=803042&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/TobagoConstants.java
(original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/TobagoConstants.java
Tue Aug 11 09:32:58 2009
@@ -21,7 +21,7 @@
  * @see org.apache.myfaces.tobago.component.Attributes
  * @see org.apache.myfaces.tobago.component.Facets
  * @see org.apache.myfaces.tobago.component.RendererTypes
- * @see org.apache.myfaces.tobago.component.AbstractUICommand
+ * @see org.apache.myfaces.tobago.component.UICommandBase
  * @see org.apache.myfaces.tobago.OnComponentCreated
  * @see org.apache.myfaces.tobago.renderkit.HtmlUtils
  * @deprecated

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIButton.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIButton.java?rev=803042&r1=803041&r2=803042&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIButton.java
(original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIButton.java
Tue Aug 11 09:32:58 2009
@@ -19,6 +19,6 @@
 
 import org.apache.myfaces.tobago.layout.LayoutComponent;
 
-public abstract class AbstractUIButton extends AbstractUICommand implements LayoutComponent
{
+public abstract class AbstractUIButton extends UICommandBase implements LayoutComponent {
 
 }

Added: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUICommand.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUICommand.java?rev=803042&view=auto
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUICommand.java
(added)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUICommand.java
Tue Aug 11 09:32:58 2009
@@ -0,0 +1,25 @@
+package org.apache.myfaces.tobago.component;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.myfaces.tobago.layout.LayoutComponent;
+
+public abstract class AbstractUICommand 
+    extends UICommandBase implements LayoutComponent {
+
+}

Copied: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIToolBarCommand.java
(from r802804, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUICommand.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIToolBarCommand.java?p2=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIToolBarCommand.java&p1=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUICommand.java&r1=802804&r2=803042&rev=803042&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUICommand.java
(original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIToolBarCommand.java
Tue Aug 11 09:32:58 2009
@@ -17,84 +17,9 @@
  * limitations under the License.
  */
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.tobago.compat.FacesUtils;
-import org.apache.myfaces.tobago.compat.InvokeOnComponent;
+import org.apache.myfaces.tobago.layout.LayoutComponent;
 
-import javax.faces.FacesException;
-import javax.faces.component.ContextCallback;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.event.FacesEvent;
-import javax.faces.event.PhaseId;
-import java.io.IOException;
-import java.util.Iterator;
+public abstract class AbstractUIToolBarCommand
+    extends UICommandBase implements LayoutComponent {
 
-public abstract class AbstractUICommand extends javax.faces.component.UICommand
-    implements InvokeOnComponent, SupportsRenderedPartially {
-
-  private static final Log LOG = LogFactory.getLog(AbstractUICommand.class);
-
-  public static final String COMMAND_TYPE_SUBMIT = "submit";
-  public static final String COMMAND_TYPE_RESET = "reset";
-  public static final String COMMAND_TYPE_NAVIGATE = "navigate";
-  public static final String COMMAND_TYPE_SCRIPT = "script";
-
-  public void processDecodes(FacesContext context) {
-    if (context == null) {
-      throw new NullPointerException();
-    }
-
-    // Skip processing if our rendered flag is false
-    if (!isRendered()) {
-      return;
-    }
-
-    // Process this component itself
-    try {
-      decode(context);
-    } catch (RuntimeException e) {
-      context.renderResponse();
-      throw e;
-    }
-
-    Iterator kids = getFacetsAndChildren();
-    while (kids.hasNext()) {
-      UIComponent kid = (UIComponent) kids.next();
-      kid.processDecodes(context);
-    }
-  }
-
-  public void encodeChildren(FacesContext facesContext) throws IOException {
-    if (isRendered()) {
-//      UILayout.getLayout(this).encodeChildrenOfComponent(facesContext, this);
-      LOG.error("children are not encoded");
-    }
-  }
-
-  public void queueEvent(FacesEvent facesEvent) {
-    // fix for TOBAGO-262
-    super.queueEvent(facesEvent);
-    if (this == facesEvent.getSource()) {
-      if (isImmediate()) {
-        facesEvent.setPhaseId(PhaseId.APPLY_REQUEST_VALUES);
-      } else {
-        facesEvent.setPhaseId(PhaseId.INVOKE_APPLICATION);
-      }
-    }
-  }
-
-  public boolean invokeOnComponent(FacesContext context, String clientId, ContextCallback
callback)
-      throws FacesException {
-    return FacesUtils.invokeOnComponent(context, this, clientId, callback);
-  }
-
-  public abstract Boolean isJsfResource();
-
-  public abstract String getResource();
-
-  public abstract String getLink();
-
-  public abstract String getTarget();
-}
+}
\ No newline at end of file

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITreeNode.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITreeNode.java?rev=803042&r1=803041&r2=803042&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITreeNode.java
(original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITreeNode.java
Tue Aug 11 09:32:58 2009
@@ -19,8 +19,8 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.tobago.event.TreeExpansionListener;
 import org.apache.myfaces.tobago.event.TreeExpansionEvent;
+import org.apache.myfaces.tobago.event.TreeExpansionListener;
 import org.apache.myfaces.tobago.model.MixedTreeModel;
 import org.apache.myfaces.tobago.model.TreePath;
 
@@ -34,7 +34,7 @@
 import java.io.IOException;
 import java.util.List;
 
-public abstract class AbstractUITreeNode extends AbstractUICommand implements SupportsMarkup,
TreeModelBuilder {
+public abstract class AbstractUITreeNode extends UICommandBase implements SupportsMarkup,
TreeModelBuilder {
 
   private static final Log LOG = LogFactory.getLog(AbstractUITreeNode.class);
 

Copied: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UICommandBase.java
(from r802804, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUICommand.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UICommandBase.java?p2=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UICommandBase.java&p1=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUICommand.java&r1=802804&r2=803042&rev=803042&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUICommand.java
(original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UICommandBase.java
Tue Aug 11 09:32:58 2009
@@ -31,10 +31,10 @@
 import java.io.IOException;
 import java.util.Iterator;
 
-public abstract class AbstractUICommand extends javax.faces.component.UICommand
+public abstract class UICommandBase extends javax.faces.component.UICommand
     implements InvokeOnComponent, SupportsRenderedPartially {
 
-  private static final Log LOG = LogFactory.getLog(AbstractUICommand.class);
+  private static final Log LOG = LogFactory.getLog(UICommandBase.class);
 
   public static final String COMMAND_TYPE_SUBMIT = "submit";
   public static final String COMMAND_TYPE_RESET = "reset";

Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UICommandBase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UICommandBase.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIDatePicker.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIDatePicker.java?rev=803042&r1=803041&r2=803042&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIDatePicker.java
(original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIDatePicker.java
Tue Aug 11 09:32:58 2009
@@ -29,7 +29,7 @@
  * Date: 30.05.2006
  * Time: 19:22:40
  */
-public class UIDatePicker extends UILinkCommand implements OnComponentCreated {
+public class UIDatePicker extends UILink implements OnComponentCreated {
 
   public static final String COMPONENT_TYPE = "org.apache.myfaces.tobago.DatePicker";
 

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ButtonTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ButtonTagDeclaration.java?rev=803042&r1=803041&r2=803042&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ButtonTagDeclaration.java
(original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ButtonTagDeclaration.java
Tue Aug 11 09:32:58 2009
@@ -37,11 +37,6 @@
 import org.apache.myfaces.tobago.taglib.decl.IsGridLayoutComponent;
 import org.apache.myfaces.tobago.taglib.decl.IsInline;
 
-/*
- * Date: 10.02.2006
- * Time: 22:00:03
- */
-
 /**
  * Renders a button element.
  */

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/CommandTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/CommandTagDeclaration.java?rev=803042&r1=803041&r2=803042&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/CommandTagDeclaration.java
(original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/CommandTagDeclaration.java
Tue Aug 11 09:32:58 2009
@@ -24,11 +24,7 @@
 import org.apache.myfaces.tobago.taglib.decl.HasId;
 import org.apache.myfaces.tobago.taglib.decl.HasValue;
 import org.apache.myfaces.tobago.taglib.decl.IsDisabled;
-
-/*
- * Date: 05.08.2006
- * Time: 12:01:32
- */
+import org.apache.myfaces.tobago.taglib.decl.IsGridLayoutComponent;
 
 /**
  * Use this tag only as a facet for click, change in selectOneRadio,
@@ -39,7 +35,8 @@
     uiComponentBaseClass = "org.apache.myfaces.tobago.component.AbstractUICommand",
     rendererType = RendererTypes.COMMAND,
     allowedChildComponenents = "NONE")
-public interface CommandTagDeclaration extends AbstractCommandTagDeclaration, HasId, HasValue,
IsDisabled {
+public interface CommandTagDeclaration
+    extends AbstractCommandTagDeclaration, HasId, HasValue, IsDisabled, IsGridLayoutComponent
{
 
 
 

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/DatePickerTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/DatePickerTagDeclaration.java?rev=803042&r1=803041&r2=803042&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/DatePickerTagDeclaration.java
(original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/DatePickerTagDeclaration.java
Tue Aug 11 09:32:58 2009
@@ -37,7 +37,7 @@
 @Tag(name = "datePicker")
 @UIComponentTag(
     uiComponent = "org.apache.myfaces.tobago.component.UIDatePicker",
-    uiComponentBaseClass = "org.apache.myfaces.tobago.component.UILinkCommand",
+    uiComponentBaseClass = "org.apache.myfaces.tobago.component.UILink",
     generate = false,
     componentType = "org.apache.myfaces.tobago.DatePicker",
     rendererType = RendererTypes.DATE_PICKER,

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/LinkTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/LinkTagDeclaration.java?rev=803042&r1=803041&r2=803042&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/LinkTagDeclaration.java
(original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/LinkTagDeclaration.java
Tue Aug 11 09:32:58 2009
@@ -33,6 +33,7 @@
 import org.apache.myfaces.tobago.taglib.decl.HasTabIndex;
 import org.apache.myfaces.tobago.taglib.decl.HasTip;
 import org.apache.myfaces.tobago.taglib.decl.IsDisabled;
+import org.apache.myfaces.tobago.taglib.decl.IsGridLayoutComponent;
 import org.apache.myfaces.tobago.taglib.decl.IsInline;
 
 /**
@@ -41,7 +42,7 @@
 @Tag(name = "link", tagExtraInfoClassName = "org.apache.myfaces.tobago.taglib.component.CommandTagExtraInfo")
 @BodyContentDescription(anyTagOf = "facestag")
 @UIComponentTag(
-    uiComponent = "org.apache.myfaces.tobago.component.UILinkCommand",
+    uiComponent = "org.apache.myfaces.tobago.component.UILink",
     uiComponentBaseClass = "org.apache.myfaces.tobago.component.UICommand",
     rendererType = RendererTypes.LINK,
     allowedChildComponenents = "NONE",
@@ -56,5 +57,5 @@
             allowedChildComponenents = "org.apache.myfaces.tobago.Popup")})
 public interface LinkTagDeclaration extends AbstractCommandTagDeclaration,
     HasIdBindingAndRendered, HasLabelAndAccessKey, IsDisabled, IsInline,
-    HasCommandType, HasTip, HasImage, HasMarkup, HasTabIndex {
+    HasCommandType, HasTip, HasImage, HasMarkup, HasTabIndex, IsGridLayoutComponent {
 }

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarCommandTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarCommandTagDeclaration.java?rev=803042&r1=803041&r2=803042&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarCommandTagDeclaration.java
(original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarCommandTagDeclaration.java
Tue Aug 11 09:32:58 2009
@@ -27,11 +27,7 @@
 import org.apache.myfaces.tobago.taglib.decl.HasLabelAndAccessKey;
 import org.apache.myfaces.tobago.taglib.decl.HasTip;
 import org.apache.myfaces.tobago.taglib.decl.IsDisabled;
-
-/*
- * Date: 10.04.2006
- * Time: 20:29:42
- */
+import org.apache.myfaces.tobago.taglib.decl.IsGridLayoutComponent;
 
 /**
  * Renders a command button within a toolbar.
@@ -39,9 +35,10 @@
 @Tag(name = "toolBarCommand", tagExtraInfoClassName = "org.apache.myfaces.tobago.taglib.component.CommandTagExtraInfo")
 @UIComponentTag(
     uiComponent = "org.apache.myfaces.tobago.component.UIToolBarCommand",
-    uiComponentBaseClass = "org.apache.myfaces.tobago.component.AbstractUICommand",
+    uiComponentBaseClass = "org.apache.myfaces.tobago.component.AbstractUIToolBarCommand",
     rendererType = RendererTypes.BUTTON,
     allowedChildComponenents = "NONE")
-public interface ToolBarCommandTagDeclaration extends AbstractCommandTagDeclaration, HasIdBindingAndRendered,
-    HasLabelAndAccessKey, HasImage, IsDisabled, HasCommandType, HasTip {
+public interface ToolBarCommandTagDeclaration
+    extends AbstractCommandTagDeclaration, HasIdBindingAndRendered,
+    HasLabelAndAccessKey, HasImage, IsDisabled, HasCommandType, HasTip, IsGridLayoutComponent
{
 }

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasCommandType.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasCommandType.java?rev=803042&r1=803041&r2=803042&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasCommandType.java
(original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasCommandType.java
Tue Aug 11 09:32:58 2009
@@ -19,7 +19,7 @@
 
 import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
 import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
-import org.apache.myfaces.tobago.component.AbstractUICommand;
+import org.apache.myfaces.tobago.component.UICommandBase;
 
 /**
  * $Id$
@@ -32,7 +32,7 @@
    * the default value is 'submit' is used.
    */
   @TagAttribute
-  @UIComponentTagAttribute(defaultValue = AbstractUICommand.COMMAND_TYPE_SUBMIT)
+  @UIComponentTagAttribute(defaultValue = UICommandBase.COMMAND_TYPE_SUBMIT)
   @Deprecated
   void setType(String type);
 }

Modified: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericComponentTagUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericComponentTagUnitTest.java?rev=803042&r1=803041&r2=803042&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericComponentTagUnitTest.java
(original)
+++ myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericComponentTagUnitTest.java
Tue Aug 11 09:32:58 2009
@@ -102,7 +102,7 @@
     application.addComponent("javax.faces.Command", "javax.faces.component.UICommand");
     application.addComponent("org.apache.myfaces.tobago.Command", "org.apache.myfaces.tobago.component.UICommand");
     application
-        .addComponent("org.apache.myfaces.tobago.LinkCommand", "org.apache.myfaces.tobago.component.UILinkCommand");
+        .addComponent("org.apache.myfaces.tobago.LinkCommand", "org.apache.myfaces.tobago.component.UILink");
     application
         .addComponent("org.apache.myfaces.tobago.ButtonCommand", "org.apache.myfaces.tobago.component.UIButtonCommand");
 

Modified: myfaces/tobago/trunk/extension/security/src/main/java/org/apache/myfaces/tobago/security/UISecuredLinkCommand.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/security/src/main/java/org/apache/myfaces/tobago/security/UISecuredLinkCommand.java?rev=803042&r1=803041&r2=803042&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/security/src/main/java/org/apache/myfaces/tobago/security/UISecuredLinkCommand.java
(original)
+++ myfaces/tobago/trunk/extension/security/src/main/java/org/apache/myfaces/tobago/security/UISecuredLinkCommand.java
Tue Aug 11 09:32:58 2009
@@ -17,11 +17,11 @@
  * limitations under the License.
  */
 
-import org.apache.myfaces.tobago.component.UILinkCommand;
+import org.apache.myfaces.tobago.component.UILink;
 
 import javax.faces.context.FacesContext;
 
-public class UISecuredLinkCommand extends UILinkCommand {
+public class UISecuredLinkCommand extends UILink {
 
   public static final String COMPONENT_TYPE = "org.apache.myfaces.tobago.SecuredLinkCommand";
 

Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/MenuCheckboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/MenuCheckboxExtensionTag.java?rev=803042&r1=803041&r2=803042&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/MenuCheckboxExtensionTag.java
(original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/MenuCheckboxExtensionTag.java
Tue Aug 11 09:32:58 2009
@@ -20,9 +20,9 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.myfaces.tobago.apt.annotation.ExtensionTag;
 import org.apache.myfaces.tobago.apt.annotation.Tag;
-import org.apache.myfaces.tobago.component.AbstractUICommand;
 import static org.apache.myfaces.tobago.component.Attributes.RENDERED_PARTIALLY;
 import org.apache.myfaces.tobago.component.Facets;
+import org.apache.myfaces.tobago.component.UICommandBase;
 import org.apache.myfaces.tobago.internal.taglib.MenuItemTag;
 import org.apache.myfaces.tobago.internal.taglib.SelectBooleanCheckboxTag;
 import org.apache.myfaces.tobago.taglib.decl.AbstractCommandTagDeclaration;
@@ -143,7 +143,7 @@
     if (renderedPartially == null) {
       // Move attribute renderedPartially from selectOne to menuCommand component
       UIComponent selectBooleanComponent = selectBooleanCheckbox.getComponentInstance();
-      AbstractUICommand command = (AbstractUICommand) menuCommandTag.getComponentInstance();
+      UICommandBase command = (UICommandBase) menuCommandTag.getComponentInstance();
       ValueBinding binding = selectBooleanComponent.getValueBinding(RENDERED_PARTIALLY);
       if (binding != null) {
         command.setValueBinding(RENDERED_PARTIALLY, binding);

Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/MenuRadioExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/MenuRadioExtensionTag.java?rev=803042&r1=803041&r2=803042&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/MenuRadioExtensionTag.java
(original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/MenuRadioExtensionTag.java
Tue Aug 11 09:32:58 2009
@@ -20,9 +20,9 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.myfaces.tobago.apt.annotation.ExtensionTag;
 import org.apache.myfaces.tobago.apt.annotation.Tag;
-import org.apache.myfaces.tobago.component.AbstractUICommand;
 import static org.apache.myfaces.tobago.component.Attributes.RENDERED_PARTIALLY;
 import org.apache.myfaces.tobago.component.Facets;
+import org.apache.myfaces.tobago.component.UICommandBase;
 import org.apache.myfaces.tobago.internal.taglib.MenuItemTag;
 import org.apache.myfaces.tobago.internal.taglib.SelectOneRadioTag;
 import org.apache.myfaces.tobago.taglib.decl.AbstractCommandTagDeclaration;
@@ -150,7 +150,7 @@
     if (renderedPartially == null) {
       // Move attribute renderedPartially from selectOne to menuCommand component
       UIComponent selectOneComponent = selectOneRadio.getComponentInstance();
-      AbstractUICommand command = (AbstractUICommand) menuCommandTag.getComponentInstance();
+      UICommandBase command = (UICommandBase) menuCommandTag.getComponentInstance();
       ValueBinding binding = selectOneComponent.getValueBinding(RENDERED_PARTIALLY);
       if (binding != null) {
         command.setValueBinding(RENDERED_PARTIALLY, binding);

Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/MenuCheckboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/MenuCheckboxExtensionTag.java?rev=803042&r1=803041&r2=803042&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/MenuCheckboxExtensionTag.java
(original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/MenuCheckboxExtensionTag.java
Tue Aug 11 09:32:58 2009
@@ -17,24 +17,23 @@
  * limitations under the License.
  */
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.myfaces.tobago.apt.annotation.DynamicExpression;
 import org.apache.myfaces.tobago.apt.annotation.ExtensionTag;
 import org.apache.myfaces.tobago.apt.annotation.Tag;
 import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
 import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
-import org.apache.myfaces.tobago.component.Facets;
 import org.apache.myfaces.tobago.component.Attributes;
-import org.apache.myfaces.tobago.component.AbstractUICommand;
+import org.apache.myfaces.tobago.component.Facets;
+import org.apache.myfaces.tobago.component.UICommandBase;
 import org.apache.myfaces.tobago.internal.taglib.MenuItemTag;
 import org.apache.myfaces.tobago.internal.taglib.SelectBooleanCheckboxTag;
 
-import javax.faces.webapp.FacetTag;
 import javax.faces.component.UIComponent;
+import javax.faces.webapp.FacetTag;
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.BodyTagSupport;
 
-import org.apache.commons.lang.StringUtils;
-
 /*
  * Date: 09.05.2006
  * Time: 00:00:49
@@ -127,7 +126,7 @@
     if (renderedPartially == null) {
       // Move attribute renderedPartially from selectOne to menuCommand component
       UIComponent selectBooleanComponent = selectBooleanCheckbox.getComponentInstance();
-      AbstractUICommand command = (AbstractUICommand) menuCommandTag.getComponentInstance();
+      UICommandBase command = (UICommandBase) menuCommandTag.getComponentInstance();
       javax.el.ValueExpression expression = selectBooleanComponent.getValueExpression(Attributes.RENDERED_PARTIALLY);
       if (expression != null) {
         command.setValueExpression(Attributes.RENDERED_PARTIALLY, expression);

Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/MenuRadioExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/MenuRadioExtensionTag.java?rev=803042&r1=803041&r2=803042&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/MenuRadioExtensionTag.java
(original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/MenuRadioExtensionTag.java
Tue Aug 11 09:32:58 2009
@@ -17,24 +17,23 @@
  * limitations under the License.
  */
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.myfaces.tobago.apt.annotation.DynamicExpression;
 import org.apache.myfaces.tobago.apt.annotation.ExtensionTag;
 import org.apache.myfaces.tobago.apt.annotation.Tag;
 import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
 import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
-import org.apache.myfaces.tobago.component.Facets;
 import org.apache.myfaces.tobago.component.Attributes;
-import org.apache.myfaces.tobago.component.AbstractUICommand;
+import org.apache.myfaces.tobago.component.Facets;
+import org.apache.myfaces.tobago.component.UICommandBase;
 import org.apache.myfaces.tobago.internal.taglib.MenuItemTag;
 import org.apache.myfaces.tobago.internal.taglib.SelectOneRadioTag;
 
-import javax.faces.webapp.FacetTag;
 import javax.faces.component.UIComponent;
+import javax.faces.webapp.FacetTag;
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.BodyTagSupport;
 
-import org.apache.commons.lang.StringUtils;
-
 /*
  * Date: 09.05.2006
  * Time: 17:41:39
@@ -134,7 +133,7 @@
     if (renderedPartially == null) {
       // Move attribute renderedPartially from selectOne to menuCommand component
       UIComponent selectOneComponent = selectOneRadio.getComponentInstance();
-      AbstractUICommand command = (AbstractUICommand) menuCommandTag.getComponentInstance();
+      UICommandBase command = (UICommandBase) menuCommandTag.getComponentInstance();
       javax.el.ValueExpression expression = selectOneComponent.getValueExpression(Attributes.RENDERED_PARTIALLY);
       if (expression != null) {
         command.setValueExpression(Attributes.RENDERED_PARTIALLY, expression);

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ButtonRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ButtonRenderer.java?rev=803042&r1=803041&r2=803042&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ButtonRenderer.java
(original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ButtonRenderer.java
Tue Aug 11 09:32:58 2009
@@ -24,9 +24,9 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.tobago.component.AbstractUICommand;
 import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.component.UIButtonCommand;
+import org.apache.myfaces.tobago.component.UICommandBase;
 import org.apache.myfaces.tobago.renderkit.CommandRendererBase;
 import org.apache.myfaces.tobago.renderkit.LabelWithAccessKey;
 import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
@@ -58,7 +58,7 @@
     if (!(component instanceof UICommand)) {
       return;
     }
-    AbstractUICommand command = (AbstractUICommand) component;
+    UICommandBase command = (UICommandBase) component;
     String clientId = command.getClientId(facesContext);
 
     CommandRendererHelper helper = new CommandRendererHelper(facesContext, command, CommandRendererHelper.Tag.BUTTON);

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LinkRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LinkRenderer.java?rev=803042&r1=803041&r2=803042&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LinkRenderer.java
(original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LinkRenderer.java
Tue Aug 11 09:32:58 2009
@@ -26,7 +26,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.component.UICommand;
-import org.apache.myfaces.tobago.component.UILinkCommand;
+import org.apache.myfaces.tobago.component.UILink;
 import org.apache.myfaces.tobago.renderkit.CommandRendererBase;
 import org.apache.myfaces.tobago.renderkit.LabelWithAccessKey;
 import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
@@ -72,8 +72,8 @@
         writer.writeAttribute(HtmlAttributes.TARGET, helper.getTarget(), true);
       }
       Integer tabIndex = null;
-      if (command instanceof UILinkCommand) {
-        tabIndex = ((UILinkCommand) command).getTabIndex();
+      if (command instanceof UILink) {
+        tabIndex = ((UILink) command).getTabIndex();
       }
       if (tabIndex != null) {
         writer.writeAttribute(HtmlAttributes.TABINDEX, tabIndex);

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java?rev=803042&r1=803041&r2=803042&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java
(original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java
Tue Aug 11 09:32:58 2009
@@ -445,7 +445,7 @@
           label.setText(labelText);
         }
       } else {
-        LOG.warn("Menu item has label=null. AbstractUICommand.getClientId()="
+        LOG.warn("Menu item has label=null. UICommandBase.getClientId()="
             + command.getClientId(facesContext));
       }
       String formattedValue

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/RichTextEditorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/RichTextEditorRenderer.java?rev=803042&r1=803041&r2=803042&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/RichTextEditorRenderer.java
(original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/RichTextEditorRenderer.java
Tue Aug 11 09:32:58 2009
@@ -171,8 +171,8 @@
     toolbar.getAttributes().put(Attributes.ICON_SIZE, UIToolBar.ICON_SMALL);
     toolbar.getAttributes().put(Attributes.LABEL_POSITION, UIToolBar.LABEL_OFF);
 
-    UICommand //command = (AbstractUICommand) ComponentUtil.createComponent(
-//        facesContext, AbstractUICommand.COMPONENT_TYPE, MENU_COMMAND);
+    UICommand //command = (UICommandBase) ComponentUtil.createComponent(
+//        facesContext, UICommandBase.COMPONENT_TYPE, MENU_COMMAND);
 //    toolbar.getChildren().add(command);
 
     command = (UICommand) CreateComponentUtils.createComponent(

Modified: myfaces/tobago/trunk/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/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties?rev=803042&r1=803041&r2=803042&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties
(original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties
Tue Aug 11 09:32:58 2009
@@ -59,10 +59,19 @@
 
 ColumnSelector.fixedWidth=24
 
+Date.preferredHeight=25
+Date.css.border-left-width=2
+Date.css.border-top-width=2
+Date.css.border-right-width=2
+Date.css.border-bottom-width=2
+Date.css.padding-left=2
+Date.css.padding-top=2
+Date.css.padding-right=2
+Date.css.padding-bottom=2
+
 Image.headerHeight=0
 
 In.preferredHeight=25
-
 In.css.border-left-width=2
 In.css.border-top-width=2
 In.css.border-right-width=2
@@ -99,10 +108,14 @@
 Popup.paddingWidth=8
 Popup.paddingHeight=5
 
+RichTextEditor.headerHeight=28
+
 SelectBooleanCheckbox.componentExtraWidth=21
 
 SelectManyCheckbox.fixedHeight=20
 
+SelectOneRadio.fixedHeight=20
+
 Sheet.ascendingMarkerWidth=10
 Sheet.headerHeight=20
 Sheet.footerHeight=20
@@ -135,11 +148,15 @@
 TextArea.css.padding-bottom=0
 
 Time.fixedWidth=105
-
-SelectOneRadio.fixedHeight=20
-
-RichTextEditor.headerHeight=28
-
+Time.preferredHeight=25
+Time.css.border-left-width=2
+Time.css.border-top-width=2
+Time.css.border-right-width=2
+Time.css.border-bottom-width=2
+Time.css.padding-left=2
+Time.css.padding-top=2
+Time.css.padding-right=2
+Time.css.padding-bottom=2
 
 ToolBar.small_off_Height=36
 ToolBar.small_bottom_Height=53

Modified: myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties?rev=803042&r1=803041&r2=803042&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties
(original)
+++ myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties
Tue Aug 11 09:32:58 2009
@@ -33,15 +33,23 @@
 Box.rightOffset=7
 Box.bottomOffset=7
 
+Date.preferredHeight=20
+Date.css.border-left-width=1
+Date.css.border-top-width=1
+Date.css.border-right-width=1
+Date.css.border-bottom-width=1
+Date.css.padding-left=2
+Date.css.padding-top=2
+Date.css.padding-right=2
+Date.css.padding-bottom=2
+
 DatePicker.fixedWidth=20
 
 In.preferredHeight=20
-
 In.css.border-left-width=1
 In.css.border-top-width=1
 In.css.border-right-width=1
 In.css.border-bottom-width=1
-
 In.css.padding-left=2
 In.css.padding-top=2
 In.css.padding-right=2
@@ -82,6 +90,16 @@
 TextArea.css.padding-right=0
 TextArea.css.padding-bottom=0
 
+Time.preferredHeight=20
+Time.css.border-left-width=1
+Time.css.border-top-width=1
+Time.css.border-right-width=1
+Time.css.border-bottom-width=1
+Time.css.padding-left=2
+Time.css.padding-top=2
+Time.css.padding-right=2
+Time.css.padding-bottom=2
+
 ToolBar.small_off_Height=24
 ToolBar.small_bottom_Height=43
 ToolBar.small_right_Height=27

Modified: myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/CommandRendererHelper.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/CommandRendererHelper.java?rev=803042&r1=803041&r2=803042&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/CommandRendererHelper.java
(original)
+++ myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/CommandRendererHelper.java
Tue Aug 11 09:32:58 2009
@@ -19,9 +19,9 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.tobago.component.AbstractUICommand;
 import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.component.Facets;
+import org.apache.myfaces.tobago.component.UICommandBase;
 import org.apache.myfaces.tobago.component.UIPopup;
 import org.apache.myfaces.tobago.context.ClientProperties;
 import org.apache.myfaces.tobago.context.ResourceManagerUtil;
@@ -51,15 +51,15 @@
   private String href;
   private String target;
 
-  public CommandRendererHelper(FacesContext facesContext, AbstractUICommand component) {
+  public CommandRendererHelper(FacesContext facesContext, UICommandBase component) {
     initOnclick(facesContext, component, null);
   }
 
-  public CommandRendererHelper(FacesContext facesContext, AbstractUICommand component, Tag
tag) {
+  public CommandRendererHelper(FacesContext facesContext, UICommandBase component, Tag tag)
{
     initOnclick(facesContext, component, tag);
   }
 
-  private void initOnclick(FacesContext facesContext, AbstractUICommand command, Tag tag)
{
+  private void initOnclick(FacesContext facesContext, UICommandBase command, Tag tag) {
 
     disabled = ComponentUtil.getBooleanAttribute(command, Attributes.DISABLED);
     href = getEmptyHref(facesContext);
@@ -92,10 +92,10 @@
         }
       } else if (command.getAttributes().get(Attributes.ONCLICK) != null) {
         onclick = prepareOnClick(facesContext, command);
-      } else if (command instanceof AbstractUICommand
-          && ((AbstractUICommand) command).getRenderedPartially().length > 0)
{
+      } else if (command instanceof UICommandBase
+          && ((UICommandBase) command).getRenderedPartially().length > 0) {
 
-        String[] componentIds = ((AbstractUICommand) command).getRenderedPartially();
+        String[] componentIds = ((UICommandBase) command).getRenderedPartially();
 
           // TODO find a better way
           boolean popupAction = ComponentUtil.containsPopupActionListener(command);
@@ -169,7 +169,7 @@
     return onclick;
   }
 
-  private String generateUrl(FacesContext facesContext, AbstractUICommand component) {
+  private String generateUrl(FacesContext facesContext, UICommandBase component) {
     String url;
     Application application = facesContext.getApplication();
     ViewHandler viewHandler = application.getViewHandler();



Mime
View raw message