You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mk...@apache.org on 2021/03/15 18:32:59 UTC

svn commit: r1887683 - /myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java

Author: mkienenb
Date: Mon Mar 15 18:32:59 2021
New Revision: 1887683

URL: http://svn.apache.org/viewvc?rev=1887683&view=rev
Log:
TOMAHAWK-1688 Fix broken src url for default popup button image

Modified:
    myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java

Modified: myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java?rev=1887683&r1=1887682&r2=1887683&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java (original)
+++ myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java Mon Mar 15 18:32:59 2021
@@ -118,6 +118,9 @@ public class HtmlCalendarRenderer
 {
     private final Log log = LogFactory.getLog(HtmlCalendarRenderer.class);
 
+    private static final String DEFAULT_IMAGE_LIBRARY = "oam.custom.calendar.images";
+    private static final String DEFAULT_IMAGE_POPUP_BUTTON = "calendar.gif";
+
     private static final String JAVASCRIPT_ENCODED = "org.apache.myfaces.calendar.JAVASCRIPT_ENCODED";
     private static final String JAVASCRIPT_ENCODED_JSF2 = "org.apache.myfaces.calendar.JAVASCRIPT_ENCODED_JSF2";
 
@@ -1039,7 +1042,7 @@ public class HtmlCalendarRenderer
             writer.writeAttribute(HTML.SRC_ATTR, addResource.getResourceUri(facesContext, imgUrl), null);
         } else
         {
-            writer.writeAttribute(HTML.SRC_ATTR, addResource.getResourceUri(facesContext, HtmlCalendarRenderer.class, "images/calendar.gif"), null);
+            writer.writeAttribute(HTML.SRC_ATTR, TomahawkResourceUtils.getIconSrc(facesContext, DEFAULT_IMAGE_LIBRARY, DEFAULT_IMAGE_POPUP_BUTTON), null);
         }
     }