You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2012/12/13 14:12:59 UTC

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

Author: werpu
Date: Thu Dec 13 13:12:58 2012
New Revision: 1421283

URL: http://svn.apache.org/viewvc?rev=1421283&view=rev
Log:
 TOMAHAWK-1646 reformatting code

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

Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java?rev=1421283&r1=1421282&r2=1421283&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java Thu Dec 13 13:12:58 2012
@@ -721,15 +721,18 @@ public class HtmlCalendarRenderer
 
             writer.endElement(HTML.INPUT_ELEM);
 
-        } else if (!renderButtonAsImage && renderAsImageButton) {
+        } else if (!renderButtonAsImage && renderAsImageButton)
+        {
             writer.startElement(HTML.BUTTON_ELEM, uiComponent);
             writer.writeAttribute(HTML.ONCLICK_ATTR,
-                    prov.getFunctionCall(facesContext, uiComponent, dateFormat)+"; return false;",
+                    prov.getFunctionCall(facesContext, uiComponent, dateFormat) + "; return false;",
                     null);
             String imgUrl = (String) uiComponent.getAttributes().get("popupButtonImageUrl");
-            if (popupButtonString == null && imgUrl == null || imgUrl.trim().equals("")) {
+            if (popupButtonString == null && imgUrl == null || imgUrl.trim().equals(""))
+            {
                 popupButtonString = "...";
-            }  else if (popupButtonString == null) {
+            } else if (popupButtonString == null)
+            {
                 popupButtonString = "";
             }
 

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=1421283&r1=1421282&r2=1421283&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 Thu Dec 13 13:12:58 2012
@@ -1043,18 +1043,15 @@ public class HtmlCalendarRenderer
         }
     }
 
-    private static void writeButtonStyleClass(ResponseWriter writer, String popupButtonStyleClass) throws IOException
-    {
-        if(popupButtonStyleClass != null)
-        {
+    private static void writeButtonStyleClass(ResponseWriter writer, String popupButtonStyleClass) throws IOException {
+        if(popupButtonStyleClass != null) {
             writer.writeAttribute(HTML.CLASS_ATTR, popupButtonStyleClass, null);
         }
     }
 
     private static void writeButtonStyle(ResponseWriter writer, String popupButtonStyle) throws IOException
     {
-        if(popupButtonStyle != null)
-        {
+        if(popupButtonStyle != null) {
             writer.writeAttribute(HTML.STYLE_ATTR, popupButtonStyle, null);
         }
     }