svn commit: r1330364 - in /myfaces/tobago/trunk/tobago-theme: tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html...

[lo...@apache.org]

Author: lofwyr
Date: Wed Apr 25 15:51:54 2012
New Revision: 1330364

URL: http://svn.apache.org/viewvc?rev=1330364&view=rev
Log:
TOBAGO-1105: tc:datepicker does not respect disabled/readonly-Flag of corresponding tc:date, if an Expression ist used
- The date picker should also use the dateDisabled.gif image to show its disabled state.

Added:
    myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/dateDisabled.gif   (with props)
    myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/dateDisabled.gif   (with props)
Modified:
    myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java?rev=1330364&r1=1330363&r2=1330364&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java Wed Apr 25 15:51:54 2012
@@ -27,7 +27,6 @@ import org.apache.myfaces.tobago.compone
 import org.apache.myfaces.tobago.component.UIDate;
 import org.apache.myfaces.tobago.component.UIDatePicker;
 import org.apache.myfaces.tobago.component.UIGridLayout;
-import org.apache.myfaces.tobago.component.UIImage;
 import org.apache.myfaces.tobago.component.UIPanel;
 import org.apache.myfaces.tobago.component.UIPopup;
 import org.apache.myfaces.tobago.component.UITime;
@@ -36,7 +35,6 @@ import org.apache.myfaces.tobago.event.P
 import org.apache.myfaces.tobago.internal.util.DateFormatUtils;
 import org.apache.myfaces.tobago.internal.util.FacesContextUtils;
 import org.apache.myfaces.tobago.layout.Measure;
-import org.apache.myfaces.tobago.renderkit.html.StyleClasses;
 import org.apache.myfaces.tobago.util.ComponentUtils;
 import org.apache.myfaces.tobago.util.CreateComponentUtils;
 import org.slf4j.Logger;
@@ -152,16 +150,7 @@ public class DatePickerRenderer extends 
 
     buttonPanel.onComponentPopulated(facesContext, parent);
 
-    // create image
-    // check the id: its might be better not calling createUniqueId
-    final String imageId = linkId != null ? linkId + "image" : facesContext.getViewRoot().createUniqueId();
-    final UIImage image = (UIImage) CreateComponentUtils.createComponent(
-        facesContext, UIImage.COMPONENT_TYPE, RendererTypes.IMAGE, imageId);
-    image.setRendered(true);
-    image.setValue("image/date.gif");
-    image.setAlt(""); //TODO: i18n (write a text)
-    StyleClasses.ensureStyleClasses(image).addFullQualifiedClass("tobago-datePicker-icon");
-    picker.getChildren().add(image);
+    picker.setImage("image/date.gif");
   }
 
   @Override

Added: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/dateDisabled.gif
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/dateDisabled.gif?rev=1330364&view=auto
==============================================================================
Binary file - no diff available.

Propchange: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/dateDisabled.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/dateDisabled.gif
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/dateDisabled.gif?rev=1330364&view=auto
==============================================================================
Binary file - no diff available.

Propchange: myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/dateDisabled.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream