myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From manol...@apache.org
Subject svn commit: r380693 [8/9] - in /myfaces: core/branches/1_1_2/assembly/ core/branches/1_1_2/impl/ core/branches/1_1_2/impl/src/main/java/org/apache/myfaces/application/ core/branches/1_1_2/impl/src/main/java/org/apache/myfaces/application/jsp/ core/bran...
Date Fri, 24 Feb 2006 15:47:41 GMT
Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/inputsuggestajax/InputSuggestAjaxTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/inputsuggestajax/InputSuggestAjaxTag.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/inputsuggestajax/InputSuggestAjaxTag.java (original)
+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/inputsuggestajax/InputSuggestAjaxTag.java Fri Feb 24 07:47:18 2006
@@ -23,7 +23,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.myfaces.taglib.html.ext.HtmlInputTextTag;
-import org.apache.myfaces.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
 
 
 /**

Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/isbnvalidator/ISBNValidator.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/isbnvalidator/ISBNValidator.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/isbnvalidator/ISBNValidator.java (original)
+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/isbnvalidator/ISBNValidator.java Fri Feb 24 07:47:18 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.myfaces.custom.isbnvalidator;
 
-import org.apache.myfaces.util.MessageUtils;
+import org.apache.myfaces.shared.util.MessageUtils;
 
 import javax.faces.application.FacesMessage;
 import javax.faces.component.UIComponent;

Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/outputlinkdynamic/OutputLinkDynamic.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/outputlinkdynamic/OutputLinkDynamic.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/outputlinkdynamic/OutputLinkDynamic.java (original)
+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/outputlinkdynamic/OutputLinkDynamic.java Fri Feb 24 07:47:18 2006
@@ -21,7 +21,7 @@
 import javax.faces.el.ValueBinding;
 
 import org.apache.myfaces.custom.dynamicResources.ResourceRenderer;
-import org.apache.myfaces.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
 
 /**
  * @author Sylvain Vieujot (latest modification by $Author$)

Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/outputlinkdynamic/OutputLinkDynamicRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/outputlinkdynamic/OutputLinkDynamicRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/outputlinkdynamic/OutputLinkDynamicRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/outputlinkdynamic/OutputLinkDynamicRenderer.java Fri Feb 24 07:47:18 2006
@@ -42,14 +42,14 @@
 import org.apache.myfaces.custom.dynamicResources.ResourceContext;
 import org.apache.myfaces.custom.dynamicResources.ResourceRenderer;
 import org.apache.myfaces.custom.dynamicResources.SimpleResourceContext;
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.html.HTML;
-import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.util.AddResource;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
 import org.apache.myfaces.renderkit.html.ext.HtmlLinkRenderer;
-import org.apache.myfaces.renderkit.html.util.AddResource;
-import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
-import org.apache.myfaces.renderkit.html.util.ResourceLoader;
-import org.apache.myfaces.util.ClassUtils;
+import org.apache.myfaces.shared.renderkit.html.util.AddResourceFactory;
+import org.apache.myfaces.shared.renderkit.html.util.ResourceLoader;
+import org.apache.myfaces.shared.util.ClassUtils;
 
 /**
  * @author Sylvain Vieujot
@@ -57,8 +57,8 @@
  */
 public class OutputLinkDynamicRenderer extends HtmlLinkRenderer implements ResourceLoader
 {
-	public static final String RENDERER_TYPE = "org.apache.myfaces.OutputLinkDynamicRenderer";
-	
+    public static final String RENDERER_TYPE = "org.apache.myfaces.OutputLinkDynamicRenderer";
+
     private static final class ResourceResponseStream extends ResponseStream
     {
         private final OutputStream _out;
@@ -107,7 +107,7 @@
         writer.startElement(HTML.ANCHOR_ELEM, outputLinkDynamic);
         HtmlRendererUtils.writeIdIfNecessary(writer, outputLinkDynamic, context);
         HtmlRendererUtils.renderHTMLAttributes(writer, outputLinkDynamic,
-                HTML.ANCHOR_PASSTHROUGH_ATTRIBUTES);
+                                               HTML.ANCHOR_PASSTHROUGH_ATTRIBUTES);
 
         Map params = getParameterMap(context, component);
 
@@ -115,7 +115,7 @@
         if (resourceRendererClass == null)
         {
             throw new FacesException("No resourceRendererClass defined for component "
-                    + component.getId());
+                                     + component.getId());
         }
         params.put(RENDERER_PARAM, resourceRendererClass.getName());
 
@@ -124,10 +124,10 @@
                 .getClass(), params));
         writer.writeAttribute(HTML.HREF_ATTR, url, null);
     }
-    
+
     public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException
     {
-    	    ResponseWriter writer = facesContext.getResponseWriter();
+            ResponseWriter writer = facesContext.getResponseWriter();
         // force separate end tag
         writer.writeText("", null);
         writer.endElement(HTML.ANCHOR_ELEM);
@@ -158,11 +158,11 @@
     }
 
     /**
-     * @throws IOException 
-     * @see org.apache.myfaces.renderkit.html.util.ResourceLoader#serveResource(javax.servlet.ServletContext, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, java.lang.String)
+     * @throws IOException
+     * @see org.apache.myfaces.shared.renderkit.html.util.ResourceLoader#serveResource(javax.servlet.ServletContext, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, java.lang.String)
      */
     public void serveResource(ServletContext context, HttpServletRequest request,
-            HttpServletResponse response, String resourceUri) throws IOException
+                              HttpServletResponse response, String resourceUri) throws IOException
     {
         FacesContextFactory facesContextFactory = (FacesContextFactory) FactoryFinder
                 .getFactory(FactoryFinder.FACES_CONTEXT_FACTORY);
@@ -170,7 +170,7 @@
                 .getFactory(FactoryFinder.LIFECYCLE_FACTORY);
         Lifecycle lifecycle = lifecycleFactory.getLifecycle(getLifecycleId(context));
         FacesContext facesContext = facesContextFactory.getFacesContext(context, request, response,
-                lifecycle);
+                                                                        lifecycle);
         facesContext.setResponseStream(new ResourceResponseStream(response.getOutputStream()));
         try
         {
@@ -186,27 +186,27 @@
                 if (!ResourceRenderer.class.isAssignableFrom(rendererClass))
                 {
                     throw new FacesException("Resource renderer class [" + rendererValue
-                            + "] does not implement " + ResourceRenderer.class.getName());
+                                             + "] does not implement " + ResourceRenderer.class.getName());
                 }
                 try
                 {
-                	ResourceRenderer resourceRenderer = (ResourceRenderer) rendererClass.newInstance();
+                    ResourceRenderer resourceRenderer = (ResourceRenderer) rendererClass.newInstance();
                     renderResource(resourceRenderer, facesContext);
                 }
                 catch (InstantiationException e)
                 {
                     throw new FacesException("could not instantiate resource renderer class "
-                            + rendererValue + " : " + e.getMessage(), e);
+                                             + rendererValue + " : " + e.getMessage(), e);
                 }
                 catch (IllegalAccessException e)
                 {
                     throw new FacesException("could not instantiate resource renderer class "
-                            + rendererValue + " : " + e.getMessage(), e);
+                                             + rendererValue + " : " + e.getMessage(), e);
                 }
                 catch (Exception e)
                 {
                     throw new FacesException("could not renderer resource "
-                            + rendererValue + " : " + e.getMessage(), e);
+                                             + rendererValue + " : " + e.getMessage(), e);
                 }
             }
             catch (ClassNotFoundException e)
@@ -224,30 +224,30 @@
     protected void renderResource(ResourceRenderer resourceRenderer, FacesContext facesContext)
             throws Exception
     {
-    		ResourceContext resourceContext = createResourceContext(facesContext);
-    		
-    		resourceRenderer.setContext(facesContext, resourceContext);
-    		
+            ResourceContext resourceContext = createResourceContext(facesContext);
+
+            resourceRenderer.setContext(facesContext, resourceContext);
+
         HttpServletResponse response = (HttpServletResponse) facesContext.getExternalContext()
                 .getResponse();
-        
-        
+
+
         int contentLength = resourceRenderer.getContentLength();
         if( contentLength >0 )
         {
             response.setContentLength(contentLength);
         }
-        
+
         String contentType = resourceRenderer.getContentType();
         if (contentType != null && contentType.length() > 0 )
         {
             response.setContentType(contentType);
         }
-        
+
         ResponseStream out = facesContext.getResponseStream();
         try
         {
-        		resourceRenderer.renderResource( out );
+                resourceRenderer.renderResource( out );
         }
         finally
         {

Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/picklist/HtmlPicklistRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/picklist/HtmlPicklistRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/picklist/HtmlPicklistRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/picklist/HtmlPicklistRenderer.java Fri Feb 24 07:47:18 2006
@@ -32,13 +32,13 @@
 import javax.faces.model.SelectItem;
 
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.myfaces.renderkit.html.util.AddResource;
-import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
-import org.apache.myfaces.renderkit.JSFAttr;
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.util.AddResource;
+import org.apache.myfaces.shared.renderkit.html.util.AddResourceFactory;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
 import org.apache.myfaces.renderkit.html.HtmlListboxRenderer;
-import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
 
 /**
  * @author Bruno Aranda (latest modification by $Author$)
@@ -61,12 +61,12 @@
         if (!(uiComponent instanceof EditableValueHolder))
         {
             throw new IllegalArgumentException("Component "
-                    + uiComponent.getClientId(facesContext)
-                    + " is not an EditableValueHolder");
+                                               + uiComponent.getClientId(facesContext)
+                                               + " is not an EditableValueHolder");
         }
 
         String hiddenClientId = uiComponent.getClientId(facesContext)
-                + HIDDEN_SUFFIX;
+                                + HIDDEN_SUFFIX;
 
         Map paramValuesMap = facesContext.getExternalContext()
                 .getRequestParameterValuesMap();
@@ -78,7 +78,7 @@
         {
             String[] valuesInline = (String[]) paramValuesMap
                     .get(hiddenClientId);
-            
+
             if (valuesInline[0].trim().equals(""))
             {
                 ((EditableValueHolder) uiComponent)
@@ -108,18 +108,18 @@
             throws IOException
     {
         RendererUtils.checkParamValidity(facesContext, uiComponent,
-                HtmlSelectManyPicklist.class);
+                                         HtmlSelectManyPicklist.class);
 
         HtmlSelectManyPicklist picklist = (HtmlSelectManyPicklist) uiComponent;
 
         encodeJavascript(facesContext, uiComponent);
 
         String availableListClientId = uiComponent.getClientId(facesContext)
-                + AVAILABLE_SUFFIX;
+                                       + AVAILABLE_SUFFIX;
         String selectedListClientId = uiComponent.getClientId(facesContext)
-                + SELECTED_SUFFIX;
+                                      + SELECTED_SUFFIX;
         String hiddenFieldCliendId = uiComponent.getClientId(facesContext)
-                + HIDDEN_SUFFIX;
+                                     + HIDDEN_SUFFIX;
 
         List selectItemList = RendererUtils
                 .getSelectItemList((UISelectMany) uiComponent);
@@ -143,7 +143,7 @@
 
         encodeSelect(facesContext, picklist, availableListClientId, isDisabled(
                 facesContext, uiComponent), picklist.getSize(),
-                selectItemsForAvailableList, converter);
+                                            selectItemsForAvailableList, converter);
 
         writer.endElement(HTML.TD_ELEM);
 
@@ -151,20 +151,20 @@
         writer.startElement(HTML.TD_ELEM, uiComponent);
 
         String javascriptAddToSelected = FUNCTION_ADD_TO_SELECTED + "('"
-                + availableListClientId + "','" + selectedListClientId + "','"
-                + hiddenFieldCliendId + "')";
+                                         + availableListClientId + "','" + selectedListClientId + "','"
+                                         + hiddenFieldCliendId + "')";
         String javascriptRemoveFromSelected = FUNCTION_REMOVE_FROM_SELECTED
-                + "('" + availableListClientId + "','" + selectedListClientId
-                + "','" + hiddenFieldCliendId + "')";
+                                              + "('" + availableListClientId + "','" + selectedListClientId
+                                              + "','" + hiddenFieldCliendId + "')";
 
         encodeSwapButton(facesContext, uiComponent, javascriptAddToSelected,
-                ">");
+                         ">");
 
         writer.startElement(HTML.BR_ELEM, uiComponent);
         writer.endElement(HTML.BR_ELEM);
 
         encodeSwapButton(facesContext, uiComponent,
-                javascriptRemoveFromSelected, "<");
+                         javascriptRemoveFromSelected, "<");
 
         writer.endElement(HTML.TD_ELEM);
 
@@ -173,11 +173,11 @@
 
         encodeSelect(facesContext, picklist, selectedListClientId, isDisabled(
                 facesContext, uiComponent), picklist.getSize(),
-                selectItemsForSelectedValues, converter);
+                                            selectItemsForSelectedValues, converter);
 
         // hidden field with the selected values
         encodeHiddenField(facesContext, uiComponent, hiddenFieldCliendId,
-                lookupSet);
+                          lookupSet);
 
         writer.endElement(HTML.TD_ELEM);
         writer.endElement(HTML.TR_ELEM);
@@ -185,31 +185,31 @@
     }
 
     private void encodeJavascript(FacesContext facesContext,
-            UIComponent uiComponent)
+                                  UIComponent uiComponent)
     {
         // AddResource takes care to add only one reference to the same script
         AddResource addResource = AddResourceFactory.getInstance(facesContext);
-        addResource.addJavaScriptAtPosition(facesContext, AddResource.HEADER_BEGIN, 
-                HtmlPicklistRenderer.class, "picklist.js");
+        addResource.addJavaScriptAtPosition(facesContext, AddResource.HEADER_BEGIN,
+                                            HtmlPicklistRenderer.class, "picklist.js");
     }
 
     private void encodeSwapButton(FacesContext facesContext,
-            UIComponent uiComponent, String javaScriptFunction, String text)
+                                  UIComponent uiComponent, String javaScriptFunction, String text)
             throws IOException
     {
         ResponseWriter writer = facesContext.getResponseWriter();
 
         writer.startElement(HTML.INPUT_ELEM, uiComponent);
         writer.writeAttribute(HTML.TYPE_ATTR, HTML.INPUT_TYPE_BUTTON,
-                JSFAttr.TYPE_ATTR);
+                              JSFAttr.TYPE_ATTR);
         writer.writeAttribute(HTML.ONCLICK_ATTR, javaScriptFunction, null);
         writer.writeAttribute(HTML.VALUE_ATTR, text, null);
         writer.endElement(HTML.INPUT_ELEM);
     }
 
     private void encodeSelect(FacesContext facesContext,
-            UIComponent uiComponent, String clientId, boolean disabled,
-            int size, List selectItemsToDisplay, Converter converter)
+                              UIComponent uiComponent, String clientId, boolean disabled,
+                              int size, List selectItemsToDisplay, Converter converter)
             throws IOException
     {
         ResponseWriter writer = facesContext.getResponseWriter();
@@ -231,14 +231,14 @@
             writer.writeAttribute(HTML.SIZE_ATTR, Integer.toString(size), null);
         }
         HtmlRendererUtils.renderHTMLAttributes(writer, uiComponent,
-                HTML.SELECT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED);
+                                               HTML.SELECT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED);
         if (disabled)
         {
             writer.writeAttribute(HTML.DISABLED_ATTR, Boolean.TRUE, null);
         }
 
         HtmlRendererUtils.renderSelectOptions(facesContext, uiComponent,
-                converter, Collections.EMPTY_SET, selectItemsToDisplay);
+                                              converter, Collections.EMPTY_SET, selectItemsToDisplay);
 
         // bug #970747: force separate end tag
         writer.writeText("", null);
@@ -246,16 +246,16 @@
     }
 
     private void encodeHiddenField(FacesContext facesContext,
-            UIComponent uiComponent, String hiddenFieldCliendId, Set lookupSet)
+                                   UIComponent uiComponent, String hiddenFieldCliendId, Set lookupSet)
             throws IOException
     {
         ResponseWriter writer = facesContext.getResponseWriter();
 
         writer.startElement(HTML.INPUT_ELEM, uiComponent);
         writer.writeAttribute(HTML.TYPE_ATTR, HTML.INPUT_TYPE_HIDDEN,
-                JSFAttr.TYPE_ATTR);
+                              JSFAttr.TYPE_ATTR);
         writer.writeAttribute(HTML.ID_ATTR, hiddenFieldCliendId,
-                JSFAttr.ID_ATTR);
+                              JSFAttr.ID_ATTR);
         writer.writeAttribute(HTML.NAME_ATTR, hiddenFieldCliendId, null);
         writer.endElement(HTML.INPUT_ELEM);
 
@@ -275,8 +275,8 @@
     }
 
     private List selectItemsForSelectedList(FacesContext facesContext,
-            UIComponent uiComponent, List selectItemList, Converter converter,
-            Set lookupSet)
+                                            UIComponent uiComponent, List selectItemList, Converter converter,
+                                            Set lookupSet)
     {
         List selectItemForSelectedValues = new ArrayList(lookupSet.size());
 
@@ -299,12 +299,12 @@
     }
 
     private List selectItemsForAvailableList(FacesContext facesContext,
-            UIComponent uiComponent, List selectItemList,
-            List selectItemsForSelectedList, Converter converter)
+                                             UIComponent uiComponent, List selectItemList,
+                                             List selectItemsForSelectedList, Converter converter)
     {
 
         return new ArrayList(CollectionUtils.subtract(selectItemList,
-                selectItemsForSelectedList));
+                                                      selectItemsForSelectedList));
     }
 
 }

Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/HtmlPlanner.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/HtmlPlanner.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/HtmlPlanner.java (original)
+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/HtmlPlanner.java Fri Feb 24 07:47:18 2006
@@ -21,7 +21,7 @@
 import javax.faces.el.ValueBinding;
 
 import org.apache.myfaces.component.UserRoleAware;
-import org.apache.myfaces.util._ComponentUtils;
+import org.apache.myfaces.shared.util._ComponentUtils;
 
 
 /**

Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/HtmlSchedule.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/HtmlSchedule.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/HtmlSchedule.java (original)
+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/HtmlSchedule.java Fri Feb 24 07:47:18 2006
@@ -21,7 +21,7 @@
 import javax.faces.el.ValueBinding;
 
 import org.apache.myfaces.component.UserRoleAware;
-import org.apache.myfaces.util._ComponentUtils;
+import org.apache.myfaces.shared.util._ComponentUtils;
 
 
 /**
@@ -32,7 +32,7 @@
 public class HtmlSchedule
     extends UISchedule implements UserRoleAware
 {
-   
+
 //  ------------------ GENERATED CODE BEGIN (do not modify!) --------------------
 
     public static final String COMPONENT_TYPE = "org.apache.myfaces.Schedule";
@@ -95,6 +95,6 @@
         _visibleOnUserRole = (String)values[2];
     }
 //  ------------------ GENERATED CODE END ---------------------------------------
-	
+
 }
 //The End

Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/AbstractCompactScheduleRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/AbstractCompactScheduleRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/AbstractCompactScheduleRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/AbstractCompactScheduleRenderer.java Fri Feb 24 07:47:18 2006
@@ -29,7 +29,7 @@
 import org.apache.myfaces.custom.schedule.HtmlSchedule;
 import org.apache.myfaces.custom.schedule.model.ScheduleDay;
 import org.apache.myfaces.custom.schedule.model.ScheduleEntry;
-import org.apache.myfaces.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HTML;
 
 /**
  * <p>
@@ -41,7 +41,7 @@
  * @version $Revision$
  */
 public abstract class AbstractCompactScheduleRenderer extends
-        AbstractScheduleRenderer
+                                                      AbstractScheduleRenderer
 {
     // ~ Methods
     // ----------------------------------------------------------------
@@ -67,6 +67,43 @@
     }
 
     /**
+     * @return The default height, in pixels, of one row in the schedule grid
+     */
+    protected abstract int getDefaultRowHeight();
+
+    /**
+     * @return The name of the property that determines the row height
+     */
+    protected abstract String getRowHeightProperty();
+
+    /**
+     * @param attributes
+     *            The attributes
+     * 
+     * @return The row height, in pixels
+     */
+    protected int getRowHeight(Map attributes)
+    {
+        int rowHeight = 0;
+
+        try
+        {
+            rowHeight = Integer.valueOf(
+                    (String) attributes.get(getRowHeightProperty())).intValue();
+        } catch (Exception e)
+        {
+            rowHeight = 0;
+        }
+
+        if (rowHeight == 0)
+        {
+            rowHeight = getDefaultRowHeight();
+        }
+
+        return rowHeight;
+    }
+
+    /**
      * <p>
      * Draw one day in the schedule
      * </p>
@@ -96,9 +133,9 @@
      *             when the cell could not be drawn
      */
     protected void writeDayCell(FacesContext context, ResponseWriter writer,
-            HtmlSchedule schedule, ScheduleDay day, float cellWidth,
-            int dayOfWeek, int dayOfMonth, boolean isWeekend,
-            boolean isCurrentMonth, int rowspan) throws IOException
+                                HtmlSchedule schedule, ScheduleDay day, float cellWidth,
+                                int dayOfWeek, int dayOfMonth, boolean isWeekend,
+                                boolean isCurrentMonth, int rowspan) throws IOException
     {
         Map attributes = schedule.getAttributes();
         writer.startElement(HTML.TD_ELEM, schedule);
@@ -106,7 +143,7 @@
         writer.writeAttribute("rowspan", String.valueOf(rowspan), null);
 
         writer.writeAttribute(HTML.CLASS_ATTR, getStyleClass(schedule,
-                isCurrentMonth ? "day" : "inactive-day"), null);
+                                                             isCurrentMonth ? "day" : "inactive-day"), null);
 
         // determine the height of the day in pixels
         StringBuffer styleBuffer = new StringBuffer();
@@ -116,36 +153,36 @@
         String myRowHeight = "height: ";
         String myContentHeight = "height: ";
 
-    	if (rowHeight > 0) 
-    	{
-    		if (isWeekend)
-    		{
-        		myRowHeight += (rowHeight / 2) + "px;";
-        		myContentHeight += ((rowHeight / 2) - 19) + "px;";
-    		}
-    		else
-    		{
-        		myRowHeight += (rowHeight + 1) + "px;"; //need to add 1 to get the weekends right
-        		myContentHeight += ((rowHeight + 1) - 18) + "px;"; //18 instead of 19, to get the weekends right
-        	}
+        if (rowHeight > 0)
+        {
+            if (isWeekend)
+            {
+                myRowHeight += (rowHeight / 2) + "px;";
+                myContentHeight += ((rowHeight / 2) - 19) + "px;";
+            }
+            else
+            {
+                myRowHeight += (rowHeight + 1) + "px;"; //need to add 1 to get the weekends right
+                myContentHeight += ((rowHeight + 1) - 18) + "px;"; //18 instead of 19, to get the weekends right
+            }
          }
-    	else
-    	{
+        else
+        {
             myRowHeight += "100%;";
-            myContentHeight += "100%;";    		
-    	}        
+            myContentHeight += "100%;";
+        }
 
         styleBuffer.append(myRowHeight);
 
         writer.writeAttribute(HTML.STYLE_ATTR, styleBuffer.toString()
-                + " width: " + cellWidth + "%;", null);
+                                               + " width: " + cellWidth + "%;", null);
 
         writer.startElement(HTML.TABLE_ELEM, schedule);
 
         writer.writeAttribute(HTML.CLASS_ATTR, getStyleClass(schedule, "day"),
-                null);
+                              null);
         writer.writeAttribute(HTML.STYLE_ATTR, styleBuffer.toString()
-                + " width: 100%;", null);
+                                               + " width: 100%;", null);
 
         writer.writeAttribute(HTML.CELLPADDING_ATTR, "0", null);
         writer.writeAttribute(HTML.CELLSPACING_ATTR, "0", null);
@@ -154,9 +191,9 @@
         writer.startElement(HTML.TR_ELEM, schedule);
         writer.startElement(HTML.TD_ELEM, schedule);
         writer.writeAttribute(HTML.CLASS_ATTR,
-                getStyleClass(schedule, "header"), null);
+                              getStyleClass(schedule, "header"), null);
         writer.writeAttribute(HTML.STYLE_ATTR,
-                "height: 18px; width: 100%; overflow: hidden", null);
+                              "height: 18px; width: 100%; overflow: hidden", null);
         writer.writeText(getDateString(context, schedule, day.getDate()), null);
         writer.endElement(HTML.TD_ELEM);
         writer.endElement(HTML.TR_ELEM);
@@ -166,14 +203,14 @@
         writer.startElement(HTML.TD_ELEM, schedule);
 
         writer.writeAttribute(HTML.CLASS_ATTR, getStyleClass(schedule,
-                "content"), null);
+                                                             "content"), null);
 
         // determine the height of the day content in pixels
         StringBuffer contentStyleBuffer = new StringBuffer();
         contentStyleBuffer.append(myContentHeight);
         contentStyleBuffer.append(" width: 100%;");
         writer.writeAttribute(HTML.STYLE_ATTR, contentStyleBuffer.toString(),
-                null);
+                              null);
 
         writer.startElement(HTML.DIV_ELEM, schedule);
         writer
@@ -212,7 +249,7 @@
      *             when the entries could not be drawn
      */
     protected void writeEntries(FacesContext context, HtmlSchedule schedule,
-            ScheduleDay day, ResponseWriter writer) throws IOException
+                                ScheduleDay day, ResponseWriter writer) throws IOException
     {
         UIForm parentForm = getParentForm(schedule);
         TreeSet entrySet = new TreeSet(comparator);
@@ -233,13 +270,13 @@
             if (isSelected(schedule, entry))
             {
                 writer.writeAttribute(HTML.CLASS_ATTR, getStyleClass(schedule,
-                        "selected"), null);
+                                                                     "selected"), null);
             }
 
             //compose the CSS style for the entry box
             StringBuffer entryStyle = new StringBuffer();
             entryStyle.append("width: 100%;");
-            String entryColor = getEntryRenderer(schedule).getColor(context, schedule, entry, isSelected(schedule, entry)); 
+            String entryColor = getEntryRenderer(schedule).getColor(context, schedule, entry, isSelected(schedule, entry));
             if (isSelected(schedule, entry) && entryColor != null) {
                 entryStyle.append(" background-color: ");
                 entryStyle.append(entryColor);
@@ -248,14 +285,14 @@
                 entryStyle.append(entryColor);
                 entryStyle.append(";");
             }
-            
+
             writer.writeAttribute(HTML.STYLE_ATTR, entryStyle.toString(), null);
 
             // draw the tooltip
             if (showTooltip(schedule))
             {
                 getEntryRenderer(schedule).renderToolTip(context, writer,
-                        schedule, entry, isSelected(schedule, entry));
+                                                         schedule, entry, isSelected(schedule, entry));
             }
 
             if (!isSelected(schedule, entry) && !schedule.isReadonly())
@@ -276,12 +313,12 @@
                 mousedown.append("'].submit()");
                 writer
                         .writeAttribute("onmousedown", mousedown.toString(),
-                                null);
+                                        null);
             }
 
             // draw the content
             getEntryRenderer(schedule).renderContent(context, writer, schedule,
-                    day, entry, true, isSelected(schedule, entry));
+                                                     day, entry, true, isSelected(schedule, entry));
 
             if (!isSelected(schedule, entry) && !schedule.isReadonly())
             {

Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/AbstractScheduleRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/AbstractScheduleRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/AbstractScheduleRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/AbstractScheduleRenderer.java Fri Feb 24 07:47:18 2006
@@ -30,12 +30,12 @@
 import javax.faces.event.ActionEvent;
 import javax.faces.render.Renderer;
 
-import org.apache.myfaces.renderkit.html.util.AddResource;
-import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
+import org.apache.myfaces.shared.renderkit.html.util.AddResource;
+import org.apache.myfaces.shared.renderkit.html.util.AddResourceFactory;
+import org.apache.myfaces.shared.renderkit.html.HTML;
 import org.apache.myfaces.custom.schedule.HtmlSchedule;
 import org.apache.myfaces.custom.schedule.util.ScheduleEntryComparator;
 import org.apache.myfaces.custom.schedule.util.ScheduleUtil;
-import org.apache.myfaces.renderkit.html.HTML;
 
 /**
  * <p>
@@ -46,7 +46,7 @@
  * @author Bruno Aranda (adaptation of Jurgen's code to myfaces)
  * @version $Revision$
  */
-public abstract class AbstractScheduleRenderer extends Renderer
+public class AbstractScheduleRenderer extends Renderer
 {
     //~ Static fields/initializers ---------------------------------------------
 
@@ -97,22 +97,21 @@
         //add needed CSS and Javascript files to the header 
 
         AddResource addResource = AddResourceFactory.getInstance(context);
-        addResource.addStyleSheet(context, AddResource.HEADER_BEGIN,
-                HtmlSchedule.class, css);
+        addResource.addStyleSheet(context, AddResource.HEADER_BEGIN, HtmlSchedule.class, css);
         addResource.addJavaScriptAtPosition(context, AddResource.HEADER_BEGIN,
-                HtmlSchedule.class, "javascript/alphaAPI.js");
+                                            HtmlSchedule.class, "javascript/alphaAPI.js");
         addResource.addJavaScriptAtPosition(context, AddResource.HEADER_BEGIN,
-                HtmlSchedule.class, "javascript/domLib.js");
+                                            HtmlSchedule.class, "javascript/domLib.js");
         addResource.addJavaScriptAtPosition(context, AddResource.HEADER_BEGIN,
-                HtmlSchedule.class, "javascript/domTT.js");
+                                            HtmlSchedule.class, "javascript/domTT.js");
         addResource.addJavaScriptAtPosition(context, AddResource.HEADER_BEGIN,
-                HtmlSchedule.class, "javascript/fadomatic.js");
+                                            HtmlSchedule.class, "javascript/fadomatic.js");
 
         //hidden input field containing the id of the selected entry
         writer.startElement(HTML.INPUT_ELEM, schedule);
         writer.writeAttribute(HTML.TYPE_ATTR, "hidden", null);
         writer.writeAttribute(HTML.NAME_ATTR, schedule.getClientId(context),
-                "clientId");
+                              "clientId");
         writer.endElement(HTML.INPUT_ELEM);
     }
 
@@ -129,7 +128,7 @@
      * @return the date string
      */
     protected String getDateString(FacesContext context, UIComponent component,
-            Date date)
+                                   Date date)
     {
         DateFormat format;
         String pattern = getHeaderDateFormat(component);
@@ -201,8 +200,7 @@
         ValueBinding binding = component.getValueBinding(className);
         if (binding != null)
         {
-            String value = (String) binding.getValue(FacesContext
-                    .getCurrentInstance());
+            String value = (String) binding.getValue(FacesContext.getCurrentInstance());
 
             if (value != null)
             {
@@ -301,70 +299,26 @@
                 .booleanValue();
     }
 
-    protected ScheduleEntryRenderer getEntryRenderer(UIComponent component)
-    {
-        if (entryRenderer != null)
-            return entryRenderer;
+    protected ScheduleEntryRenderer getEntryRenderer(UIComponent component){
+        if (entryRenderer != null) return entryRenderer;
         String className = null;
         ValueBinding binding = component.getValueBinding("entryRenderer");
         if (binding != null)
         {
-            className = (String) binding.getValue(FacesContext
-                    .getCurrentInstance());
+            className = (String)binding.getValue(FacesContext.getCurrentInstance());
         }
-        if (className == null)
-        {
+        if (className == null) {
             Map attributes = component.getAttributes();
             className = (String) attributes.get("entryRenderer");
         }
         try
         {
-            entryRenderer = (ScheduleEntryRenderer) Class.forName(className)
-                    .newInstance();
-        }
-        catch (Exception e)
+            entryRenderer = (ScheduleEntryRenderer)Class.forName(className).newInstance();
+        } catch (Exception e)
         {
             entryRenderer = new DefaultScheduleEntryRenderer();
         }
         return entryRenderer;
-    }
-
-    /**
-     * @return The default height, in pixels, of one row in the schedule grid
-     */
-    protected abstract int getDefaultRowHeight();
-
-    /**
-     * @return The name of the property that determines the row height
-     */
-    protected abstract String getRowHeightProperty();
-
-    /**
-     * @param attributes
-     *            The attributes
-     * 
-     * @return The row height, in pixels
-     */
-    protected int getRowHeight(Map attributes)
-    {
-        int rowHeight = 0;
-
-        try
-        {
-            Integer rowHeightObject = (Integer)attributes.get(getRowHeightProperty());
-            rowHeight = rowHeightObject.intValue();
-        }
-        catch (Exception e)
-        {
-            rowHeight = 0;
-        }
-
-        if (rowHeight == 0)
-        {
-            rowHeight = getDefaultRowHeight();
-        }
-
-        return rowHeight;
     }
 }
 //The End

Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/DefaultScheduleEntryRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/DefaultScheduleEntryRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/DefaultScheduleEntryRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/DefaultScheduleEntryRenderer.java Fri Feb 24 07:47:18 2006
@@ -13,7 +13,7 @@
 import org.apache.myfaces.custom.schedule.HtmlSchedule;
 import org.apache.myfaces.custom.schedule.model.ScheduleDay;
 import org.apache.myfaces.custom.schedule.model.ScheduleEntry;
-import org.apache.myfaces.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HTML;
 
 /**
  * The default implementation of the ScheduleEntryRenderer
@@ -27,8 +27,8 @@
      * @see org.apache.myfaces.custom.schedule.renderer.ScheduleEntryRenderer#renderContent(javax.faces.context.FacesContext, javax.faces.context.ResponseWriter, org.apache.myfaces.custom.schedule.HtmlSchedule, org.apache.myfaces.custom.schedule.model.ScheduleDay, org.apache.myfaces.custom.schedule.model.ScheduleEntry, boolean, boolean)
      */
     public void renderContent(FacesContext context, ResponseWriter writer,
-            HtmlSchedule schedule, ScheduleDay day, ScheduleEntry entry,
-            boolean compact, boolean selected) throws IOException
+                              HtmlSchedule schedule, ScheduleDay day, ScheduleEntry entry,
+                              boolean compact, boolean selected) throws IOException
     {
         if (compact)
         {
@@ -72,7 +72,7 @@
                 // draw the contents of the selected entry
                 writer.startElement(HTML.DIV_ELEM, null);
                 writer.writeAttribute(HTML.CLASS_ATTR, getStyleClass(schedule,
-                        "text"), null);
+                                                                     "text"), null);
                 writer.writeAttribute(HTML.STYLE_ATTR,entryStyle.toString(), null);
                 // write the title of the entry
                 if (entry.getTitle() != null)
@@ -126,7 +126,7 @@
      * @see org.apache.myfaces.custom.schedule.renderer.ScheduleEntryRenderer#getColor(javax.faces.context.FacesContext, org.apache.myfaces.custom.schedule.HtmlSchedule, org.apache.myfaces.custom.schedule.model.ScheduleEntry, boolean)
      */
     public String getColor(FacesContext context, HtmlSchedule schedule,
-            ScheduleEntry entry, boolean selected)
+                           ScheduleEntry entry, boolean selected)
     {
         return null;
     }
@@ -135,7 +135,7 @@
      * @see org.apache.myfaces.custom.schedule.renderer.ScheduleEntryRenderer#renderToolTip(javax.faces.context.FacesContext, javax.faces.context.ResponseWriter, org.apache.myfaces.custom.schedule.HtmlSchedule, org.apache.myfaces.custom.schedule.model.ScheduleEntry, boolean)
      */
     public void renderToolTip(FacesContext context, ResponseWriter writer,
-            HtmlSchedule schedule, ScheduleEntry entry, boolean selected)
+                              HtmlSchedule schedule, ScheduleEntry entry, boolean selected)
             throws IOException
     {
         StringBuffer buffer = new StringBuffer();

Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/PlannerRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/PlannerRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/PlannerRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/PlannerRenderer.java Fri Feb 24 07:47:18 2006
@@ -32,14 +32,14 @@
 import javax.faces.el.ValueBinding;
 import javax.faces.render.Renderer;
 
-import org.apache.myfaces.renderkit.html.util.AddResource;
-import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
+import org.apache.myfaces.shared.renderkit.html.util.AddResource;
+import org.apache.myfaces.shared.renderkit.html.util.AddResourceFactory;
+import org.apache.myfaces.shared.renderkit.html.HTML;
 import org.apache.myfaces.custom.schedule.HtmlPlanner;
 import org.apache.myfaces.custom.schedule.model.Day;
 import org.apache.myfaces.custom.schedule.model.PlannerEntity;
 import org.apache.myfaces.custom.schedule.model.ScheduleEntry;
 import org.apache.myfaces.custom.schedule.util.ScheduleEntryComparator;
-import org.apache.myfaces.renderkit.html.HTML;
 
 /**
  * <p>
@@ -76,24 +76,24 @@
 
         HtmlPlanner planner = (HtmlPlanner) component;
         ResponseWriter writer = context.getResponseWriter();
-        
+
         //determine the CSS file for the chosen theme
         String theme = getTheme(planner);
         if (theme == null || theme.length() < 1) theme = "default";
         String css = "css/" + theme + ".css";
-        
+
         //add needed CSS and Javascript files to the header 
 
         AddResource addResource = AddResourceFactory.getInstance(context);
         addResource.addStyleSheet(context, AddResource.HEADER_BEGIN, HtmlPlanner.class, css);
-        addResource.addJavaScriptAtPosition(context, AddResource.HEADER_BEGIN, 
-                HtmlPlanner.class, "javascript/alphaAPI.js");
         addResource.addJavaScriptAtPosition(context, AddResource.HEADER_BEGIN,
-                HtmlPlanner.class, "javascript/domLib.js");
+                                            HtmlPlanner.class, "javascript/alphaAPI.js");
         addResource.addJavaScriptAtPosition(context, AddResource.HEADER_BEGIN,
-                HtmlPlanner.class, "javascript/domTT.js");
+                                            HtmlPlanner.class, "javascript/domLib.js");
         addResource.addJavaScriptAtPosition(context, AddResource.HEADER_BEGIN,
-                HtmlPlanner.class, "javascript/fadomatic.js");
+                                            HtmlPlanner.class, "javascript/domTT.js");
+        addResource.addJavaScriptAtPosition(context, AddResource.HEADER_BEGIN,
+                                            HtmlPlanner.class, "javascript/fadomatic.js");
 
 
         int numberOfRows = planner.getModel().numberOfEntities();
@@ -103,7 +103,7 @@
         writer.startElement(HTML.DIV_ELEM, planner);
         writer.writeAttribute(HTML.CLASS_ATTR, "planner", null);
         writer.writeAttribute(HTML.STYLE_ATTR, "height: "
-                + String.valueOf(gridHeight) + "px; overflow: hidden;", null);
+                                               + String.valueOf(gridHeight) + "px; overflow: hidden;", null);
         writeBackground(context, planner, writer);
         writeForegroundStart(context, planner, writer);
     }
@@ -132,14 +132,14 @@
             writer.writeAttribute(HTML.CLASS_ATTR, "gutter", null);
             writer.startElement(HTML.DIV_ELEM, planner);
             writer.writeAttribute(HTML.STYLE_ATTR, "height: 1px; width: "
-                    + String.valueOf(getGutterWidth(planner))
-                    + "px", null);
+                                                   + String.valueOf(getGutterWidth(planner))
+                                                   + "px", null);
             writer.endElement(HTML.DIV_ELEM);
             writer.endElement(HTML.TD_ELEM);
 
             int numberOfDays = planner.getModel().numberOfDays();
             float columnWidth = (numberOfDays == 0) ? 100f
-                    : (100 / numberOfDays);
+                                : (100 / numberOfDays);
 
             for (Iterator dayIterator = planner.getModel().dayIterator(); dayIterator
                     .hasNext();)
@@ -149,7 +149,7 @@
                 writer.writeAttribute(HTML.CLASS_ATTR, "row", null);
                 writer.writeAttribute(HTML.WIDTH_ATTR, String
                         .valueOf(columnWidth)
-                        + "%", null);
+                                                       + "%", null);
                 writer
                         .writeAttribute(
                                 HTML.STYLE_ATTR,
@@ -343,7 +343,7 @@
         Map attributes = component.getAttributes();
         return (String)attributes.get("theme");
     }
-    
+
     /**
      * <p>
      * Should the tooltip be rendered?
@@ -381,7 +381,7 @@
         }
 
         if ((hour >= planner.getWorkingStartHour())
-                && (hour < planner.getWorkingEndHour()))
+            && (hour < planner.getWorkingEndHour()))
         {
             return ((hour % 2) == 0) ? "even" : "uneven";
         }
@@ -449,7 +449,7 @@
     }
 
     private boolean containsEntry(HtmlPlanner planner, Day day,
-            ScheduleEntry entry)
+                                  ScheduleEntry entry)
     {
         if ((day == null) || (entry == null))
         {
@@ -469,7 +469,7 @@
         Date dayEnd = cal.getTime();
 
         return entry.getEndTime().after(dayStart)
-                && entry.getStartTime().before(dayEnd);
+               && entry.getStartTime().before(dayEnd);
     }
 
     private String escape(String text)
@@ -495,7 +495,7 @@
      * @throws NullPointerException
      */
     private void writeBackground(FacesContext context, HtmlPlanner planner,
-            ResponseWriter writer) throws IOException
+                                 ResponseWriter writer) throws IOException
     {
         //a planner component should always be inside a UIForm
         UIForm parentForm = getParentForm(planner);
@@ -519,7 +519,7 @@
         writer.writeAttribute(HTML.CELLPADDING_ATTR, "0", null);
         writer.writeAttribute(HTML.CELLSPACING_ATTR, "1", null);
         writer.writeAttribute(HTML.STYLE_ATTR, "width: 100%; height: 100%;",
-                null);
+                              null);
         writer.startElement(HTML.TBODY_ELEM, planner);
 
         //header row, containing the day names
@@ -534,8 +534,8 @@
                         null);
         writer.startElement(HTML.DIV_ELEM, planner);
         writer.writeAttribute(HTML.STYLE_ATTR, "height: 1px; width: "
-                + String.valueOf(getGutterWidth(planner))
-                + "px", null);
+                                               + String.valueOf(getGutterWidth(planner))
+                                               + "px", null);
         writer.endElement(HTML.DIV_ELEM);
         writer.endElement(HTML.TD_ELEM);
 
@@ -549,9 +549,9 @@
             writer.startElement(HTML.TD_ELEM, planner);
             writer.writeAttribute(HTML.CLASS_ATTR, "header", null);
             writer.writeAttribute(HTML.WIDTH_ATTR, String.valueOf(columnWidth)
-                    + "%", null);
+                                                   + "%", null);
             writer.writeAttribute(HTML.STYLE_ATTR,
-                    "overflow: hidden; height: 31px;", null);
+                                  "overflow: hidden; height: 31px;", null);
             writer.startElement(HTML.DIV_ELEM, planner);
             writer.writeAttribute(HTML.CLASS_ATTR, "header", null);
             writer
@@ -567,12 +567,12 @@
                             "position: absolute; left: 0px; top: 0px; width: 100%; height: 15px; overflow: hidden; white-space: nowrap;",
                             null);
             writer.writeText(getDateString(context, planner,
-                    day.getDate()), null);
+                                           day.getDate()), null);
             writer.endElement(HTML.SPAN_ELEM);
 
             //write the name of the holiday, if there is one
             if ((day.getSpecialDayName() != null)
-                    && (day.getSpecialDayName().length() > 0))
+                && (day.getSpecialDayName().length() > 0))
             {
                 writer.startElement(HTML.SPAN_ELEM, planner);
                 writer.writeAttribute(HTML.CLASS_ATTR, "holiday", null);
@@ -595,7 +595,7 @@
         writer.startElement(HTML.TR_ELEM, planner);
 
         int numberOfHours = planner.getVisibleEndHour()
-                - planner.getVisibleStartHour();
+                            - planner.getVisibleStartHour();
         float hourWidth = (numberOfHours <= 0) ? 100f : (100 / numberOfHours);
 
         for (Iterator dayIterator = planner.getModel().dayIterator(); dayIterator
@@ -604,10 +604,10 @@
             Day day = (Day) dayIterator.next();
             writer.startElement(HTML.TD_ELEM, planner);
             writer.writeAttribute(HTML.WIDTH_ATTR, String.valueOf(columnWidth)
-                    + "%", null);
+                                                   + "%", null);
             writer.startElement(HTML.TABLE_ELEM, planner);
             writer.writeAttribute(HTML.STYLE_ATTR, "height: 100%; width: 100%",
-                    null);
+                                  null);
             writer.writeAttribute(HTML.CELLPADDING_ATTR, "0", null);
             writer.writeAttribute(HTML.CELLSPACING_ATTR, "0", null);
             writer.writeAttribute("border", "0", null);
@@ -620,7 +620,7 @@
                 writer.writeAttribute(HTML.CLASS_ATTR, "hours", null);
                 writer.writeAttribute(HTML.WIDTH_ATTR, String
                         .valueOf(hourWidth)
-                        + "%", null);
+                                                       + "%", null);
                 writer
                         .writeAttribute(
                                 HTML.STYLE_ATTR,
@@ -680,10 +680,10 @@
                 writer.startElement(HTML.TD_ELEM, planner);
                 writer.writeAttribute(HTML.WIDTH_ATTR, String
                         .valueOf(columnWidth)
-                        + "%", null);
+                                                       + "%", null);
                 writer.startElement(HTML.TABLE_ELEM, planner);
                 writer.writeAttribute(HTML.STYLE_ATTR,
-                        "height: 100%; width: 100%", null);
+                                      "height: 100%; width: 100%", null);
                 writer.writeAttribute(HTML.CELLPADDING_ATTR, "0", null);
                 writer.writeAttribute(HTML.CELLSPACING_ATTR, "0", null);
                 writer.writeAttribute("border", "0", null);
@@ -697,7 +697,7 @@
                             planner, day, hcol), null);
                     writer.writeAttribute(HTML.WIDTH_ATTR, String
                             .valueOf(hourWidth)
-                            + "%", null);
+                                                           + "%", null);
                     writer
                             .writeAttribute(
                                     HTML.STYLE_ATTR,
@@ -734,7 +734,7 @@
      * @throws IOException when the entries cannot be drawn
      */
     private void writeEntries(FacesContext context, HtmlPlanner planner,
-            PlannerEntity entity, Day day, ResponseWriter writer)
+                              PlannerEntity entity, Day day, ResponseWriter writer)
             throws IOException
     {
         for (Iterator entryIterator = entity.iterator(); entryIterator
@@ -763,7 +763,7 @@
     }
 
     private void writeForegroundEnd(FacesContext context, HtmlPlanner planner,
-            ResponseWriter writer) throws IOException
+                                    ResponseWriter writer) throws IOException
     {
         writer.endElement(HTML.TBODY_ELEM);
         writer.endElement(HTML.TABLE_ELEM);
@@ -771,7 +771,7 @@
     }
 
     private void writeForegroundStart(FacesContext context,
-            HtmlPlanner planner, ResponseWriter writer) throws IOException
+                                      HtmlPlanner planner, ResponseWriter writer) throws IOException
     {
         writer.startElement(HTML.DIV_ELEM, planner);
         writer.writeAttribute(HTML.CLASS_ATTR, "foreground", null);
@@ -787,7 +787,7 @@
         writer.writeAttribute(HTML.CELLPADDING_ATTR, "0", null);
         writer.writeAttribute(HTML.CELLSPACING_ATTR, "1", null);
         writer.writeAttribute(HTML.STYLE_ATTR, "width: 100%; height: 100%;",
-                null);
+                              null);
         writer.startElement(HTML.TBODY_ELEM, planner);
 
         //header row containing the day names
@@ -802,8 +802,8 @@
                         null);
         writer.startElement(HTML.DIV_ELEM, planner);
         writer.writeAttribute(HTML.STYLE_ATTR, "height: 1px; width: "
-                + String.valueOf(getGutterWidth(planner))
-                + "px", null);
+                                               + String.valueOf(getGutterWidth(planner))
+                                               + "px", null);
         writer.endElement(HTML.DIV_ELEM);
         writer.endElement(HTML.TD_ELEM);
 
@@ -817,9 +817,9 @@
             writer.startElement(HTML.TD_ELEM, planner);
             writer.writeAttribute(HTML.CLASS_ATTR, "header", null);
             writer.writeAttribute(HTML.WIDTH_ATTR, String.valueOf(columnWidth)
-                    + "%", null);
+                                                   + "%", null);
             writer.writeAttribute(HTML.STYLE_ATTR,
-                    "overflow: hidden; height: 31px;", null);
+                                  "overflow: hidden; height: 31px;", null);
             writer.endElement(HTML.TD_ELEM);
         }
 
@@ -835,7 +835,7 @@
             writer.startElement(HTML.TD_ELEM, planner);
             writer.writeAttribute(HTML.CLASS_ATTR, "hours", null);
             writer.writeAttribute(HTML.WIDTH_ATTR, String.valueOf(columnWidth)
-                    + "%", null);
+                                                   + "%", null);
             writer
                     .writeAttribute(
                             HTML.STYLE_ATTR,
@@ -894,9 +894,9 @@
 
                 boolean returnboolean = (entry.getStartTime()
                         .equals(other.entry.getStartTime()))
-                        && (entry.getEndTime().equals(other.entry.getEndTime()))
-                        && (entry.getId().equals(other.entry.getId()))
-                        && (day.equals(other.day));
+                                        && (entry.getEndTime().equals(other.entry.getEndTime()))
+                                        && (entry.getId().equals(other.entry.getId()))
+                                        && (day.equals(other.day));
                 /*
                  new EqualsBuilder().append(
                  entry.getStartTime(), other.entry.getStartTime()
@@ -917,7 +917,7 @@
         public int hashCode()
         {
             int returnint = entry.getStartTime().hashCode()
-                    ^ entry.getEndTime().hashCode() ^ entry.getId().hashCode();
+                            ^ entry.getEndTime().hashCode() ^ entry.getId().hashCode();
 
             return returnint;
         }
@@ -966,9 +966,9 @@
                     endMillis, visibleEndMillis) : visibleEndMillis;
 
             float left = (float) ((startMillis - visibleStartMillis) * 100)
-                    / (float) (visibleEndMillis - visibleStartMillis);
+                         / (float) (visibleEndMillis - visibleStartMillis);
             float width = (float) ((endMillis - startMillis) * 100)
-                    / (float) (visibleEndMillis - visibleStartMillis);
+                          / (float) (visibleEndMillis - visibleStartMillis);
             StringBuffer buffer = new StringBuffer();
             buffer
                     .append("position: absolute; padding: 0px; top: 0px; height: 21px; left: ");

Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/ScheduleCompactMonthRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/ScheduleCompactMonthRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/ScheduleCompactMonthRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/ScheduleCompactMonthRenderer.java Fri Feb 24 07:47:18 2006
@@ -21,7 +21,6 @@
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.Iterator;
-import java.util.TreeSet;
 
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
@@ -29,7 +28,7 @@
 
 import org.apache.myfaces.custom.schedule.HtmlSchedule;
 import org.apache.myfaces.custom.schedule.model.ScheduleDay;
-import org.apache.myfaces.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HTML;
 
 
 /**
@@ -90,7 +89,7 @@
 
         for (
             Iterator dayIterator = schedule.getModel().iterator();
-                dayIterator.hasNext();
+            dayIterator.hasNext();
         ) {
             ScheduleDay day = (ScheduleDay) dayIterator.next();
             cal.setTime(day.getDate());

Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/ScheduleCompactWeekRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/ScheduleCompactWeekRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/ScheduleCompactWeekRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/ScheduleCompactWeekRenderer.java Fri Feb 24 07:47:18 2006
@@ -19,7 +19,7 @@
 
 import org.apache.myfaces.custom.schedule.HtmlSchedule;
 import org.apache.myfaces.custom.schedule.model.ScheduleDay;
-import org.apache.myfaces.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HTML;
 
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;

Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/ScheduleDetailedDayRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/ScheduleDetailedDayRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/ScheduleDetailedDayRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/ScheduleDetailedDayRenderer.java Fri Feb 24 07:47:18 2006
@@ -20,7 +20,6 @@
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.Iterator;
-import java.util.Map;
 import java.util.TreeSet;
 
 import javax.faces.component.UIComponent;
@@ -31,7 +30,7 @@
 import org.apache.myfaces.custom.schedule.HtmlSchedule;
 import org.apache.myfaces.custom.schedule.model.ScheduleDay;
 import org.apache.myfaces.custom.schedule.model.ScheduleEntry;
-import org.apache.myfaces.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HTML;
 
 /**
  * <p>
@@ -46,7 +45,7 @@
 {
     //~ Instance fields --------------------------------------------------------
 
-    private final int defaultRowHeightInPixels = 22;
+    private final int rowHeightInPixels = 22;
 
     //~ Methods ----------------------------------------------------------------
 
@@ -66,7 +65,6 @@
 
         HtmlSchedule schedule = (HtmlSchedule) component;
         ResponseWriter writer = context.getResponseWriter();
-        int rowHeight = getRowHeight(schedule.getAttributes());
 
         //the number of rows in the grid is the number of half hours between
         //visible start hour and visible end hour, plus 1 for the header
@@ -75,14 +73,13 @@
 
         //the grid height = 22 pixels times the number of rows + 3, for the
         //table border and the cellpadding
-        int gridHeight = (numberOfRows * rowHeight) + 3 + 10;
+        int gridHeight = (numberOfRows * 22) + 3 + 10;
 
         //container div for the schedule grid
         writer.startElement(HTML.DIV_ELEM, schedule);
-        writer.writeAttribute(HTML.CLASS_ATTR, "schedule-detailed-"
-                + getTheme(schedule), null);
+        writer.writeAttribute(HTML.CLASS_ATTR, "schedule-detailed-" + getTheme(schedule), null);
         writer.writeAttribute(HTML.STYLE_ATTR, "height: "
-                + String.valueOf(gridHeight) + "px; overflow: hidden;", null);
+                                               + String.valueOf(gridHeight) + "px; overflow: hidden;", null);
         writeBackground(context, schedule, writer);
         writeForegroundStart(context, schedule, writer);
     }
@@ -107,12 +104,10 @@
         {
             ScheduleDay day = (ScheduleDay) dayIterator.next();
             writer.startElement(HTML.TD_ELEM, schedule);
-            writer.writeAttribute(HTML.CLASS_ATTR, getStyleClass(schedule,
-                    "column"), null);
+            writer.writeAttribute(HTML.CLASS_ATTR, getStyleClass(schedule, "column"), null);
             writer.writeAttribute(HTML.STYLE_ATTR, "height: 100%;", null);
             writer.startElement(HTML.DIV_ELEM, schedule);
-            writer.writeAttribute(HTML.CLASS_ATTR, getStyleClass(schedule,
-                    "column"), null);
+            writer.writeAttribute(HTML.CLASS_ATTR, getStyleClass(schedule, "column"), null);
             writer
                     .writeAttribute(
                             HTML.STYLE_ATTR,
@@ -155,7 +150,7 @@
 
         if (((schedule.getVisibleStartHour() + (row / 2)) >= schedule
                 .getWorkingStartHour())
-                && ((schedule.getVisibleStartHour() + (row / 2)) < schedule
+            && ((schedule.getVisibleStartHour() + (row / 2)) < schedule
                         .getWorkingEndHour()))
         {
             cellClass = ((row % 2) == 0) ? "even" : "uneven";
@@ -187,7 +182,7 @@
 
             //now see if we can expand the entry to the columns on the right
             while (((entry.column + entry.colspan) < numberOfColumns)
-                    && entry.canFitInColumn(entry.column + entry.colspan))
+                   && entry.canFitInColumn(entry.column + entry.colspan))
             {
                 entry.colspan++;
             }
@@ -228,13 +223,10 @@
     }
 
     private void writeBackground(FacesContext context, HtmlSchedule schedule,
-            ResponseWriter writer) throws IOException
+                                 ResponseWriter writer) throws IOException
     {
-        final int rowHeight = getRowHeight(schedule.getAttributes()) - 1;
-        final int headerHeight = rowHeight + 10;
         writer.startElement(HTML.DIV_ELEM, schedule);
-        writer.writeAttribute(HTML.CLASS_ATTR, getStyleClass(schedule,
-                "background"), null);
+        writer.writeAttribute(HTML.CLASS_ATTR, getStyleClass(schedule, "background"), null);
         writer
                 .writeAttribute(
                         HTML.STYLE_ATTR,
@@ -243,50 +235,45 @@
 
         //background table for the schedule grid
         writer.startElement(HTML.TABLE_ELEM, schedule);
-        writer.writeAttribute(HTML.CLASS_ATTR, getStyleClass(schedule,
-                "background"), null);
+        writer.writeAttribute(HTML.CLASS_ATTR, getStyleClass(schedule, "background"), null);
         writer.writeAttribute(HTML.CELLPADDING_ATTR, "0", null);
         writer.writeAttribute(HTML.CELLSPACING_ATTR, "1", null);
         writer.writeAttribute(HTML.STYLE_ATTR, "width: 100%; height: 100%",
-                null);
+                              null);
         writer.startElement(HTML.TBODY_ELEM, schedule);
 
         //header row, containing the column names
         writer.startElement(HTML.TR_ELEM, schedule);
         writer.startElement(HTML.TD_ELEM, schedule);
-        writer.writeAttribute(HTML.CLASS_ATTR,
-                getStyleClass(schedule, "gutter"), null);
+        writer.writeAttribute(HTML.CLASS_ATTR, getStyleClass(schedule, "gutter"), null);
         writer
                 .writeAttribute(
                         HTML.STYLE_ATTR,
-                        "height: "
-                                + rowHeight
-                                + "px; border-style: none; border-width: 0px; overflow: hidden; padding: 0px",
+                        "height: 21px; border-style: none; border-width: 0px; overflow: hidden; padding: 0px",
                         null);
         writer.startElement(HTML.DIV_ELEM, schedule);
         writer
                 .writeAttribute(HTML.STYLE_ATTR, "height: 1px; width: 56px",
-                        null);
+                                null);
         writer.endElement(HTML.DIV_ELEM);
         writer.endElement(HTML.TD_ELEM);
 
         float columnWidth = (schedule.getModel().size() == 0) ? 100
-                : (100 / schedule.getModel().size());
+                            : (100 / schedule.getModel().size());
 
         for (Iterator dayIterator = schedule.getModel().iterator(); dayIterator
                 .hasNext();)
         {
             ScheduleDay day = (ScheduleDay) dayIterator.next();
             writer.startElement(HTML.TD_ELEM, schedule);
-            writer.writeAttribute(HTML.CLASS_ATTR, getStyleClass(schedule,
-                    "header"), null);
+            writer.writeAttribute(HTML.CLASS_ATTR, getStyleClass(schedule, "header"), null);
             writer
                     .writeAttribute(
                             HTML.STYLE_ATTR,
-                            "height: " + headerHeight + "px; border-style: none; border-width: 0px; overflow: hidden;",
+                            "height: 31px; border-style: none; border-width: 0px; overflow: hidden;",
                             null);
             writer.writeAttribute(HTML.WIDTH_ATTR, String.valueOf(columnWidth)
-                    + "%", null);
+                                                   + "%", null);
             writer.startElement(HTML.DIV_ELEM, schedule);
             writer
                     .writeAttribute(
@@ -296,24 +283,22 @@
 
             //write the date
             writer.startElement(HTML.SPAN_ELEM, schedule);
-            writer.writeAttribute(HTML.CLASS_ATTR, getStyleClass(schedule,
-                    "date"), null);
+            writer.writeAttribute(HTML.CLASS_ATTR, getStyleClass(schedule, "date"), null);
             writer
                     .writeAttribute(
                             HTML.STYLE_ATTR,
                             "position: absolute; left: 0px; top: 0px; height: 15px; width: 100%; vertical-align: top; overflow: hidden; white-space: nowrap;",
                             null);
             writer.writeText(getDateString(context, schedule, day.getDate()),
-                    null);
+                             null);
             writer.endElement(HTML.SPAN_ELEM);
 
             //write the name of the holiday, if there is one
             if ((day.getSpecialDayName() != null)
-                    && (day.getSpecialDayName().length() > 0))
+                && (day.getSpecialDayName().length() > 0))
             {
                 writer.startElement(HTML.SPAN_ELEM, schedule);
-                writer.writeAttribute(HTML.CLASS_ATTR, getStyleClass(schedule,
-                        "holiday"), null);
+                writer.writeAttribute(HTML.CLASS_ATTR, getStyleClass(schedule, "holiday"), null);
                 writer
                         .writeAttribute(
                                 HTML.STYLE_ATTR,
@@ -341,31 +326,26 @@
             if ((row % 2) == 0)
             {
                 writer.startElement(HTML.TD_ELEM, schedule);
-                writer.writeAttribute(HTML.CLASS_ATTR, getStyleClass(schedule,
-                        "gutter"), null);
+                writer.writeAttribute(HTML.CLASS_ATTR, getStyleClass(schedule, "gutter"), null);
                 writer
                         .writeAttribute(
                                 HTML.STYLE_ATTR,
-                                "height: "
-                                        + rowHeight
-                                        + "px; border-style: none; border-width: 0px; overflow: hidden; padding: 0px",
+                                "height: 21px; border-style: none; border-width: 0px; overflow: hidden; padding: 0px",
                                 null);
                 writer.writeAttribute("rowspan", "2", null);
                 writer.startElement(HTML.SPAN_ELEM, schedule);
-                writer.writeAttribute(HTML.CLASS_ATTR, getStyleClass(schedule,
-                        "hours"), null);
+                writer.writeAttribute(HTML.CLASS_ATTR, getStyleClass(schedule, "hours"), null);
                 writer.writeAttribute(HTML.STYLE_ATTR,
-                        "vertical-align: top; height: 100%; padding: 0px;",
-                        null);
+                                      "vertical-align: top; height: 100%; padding: 0px;",
+                                      null);
                 writer.writeText(String.valueOf(schedule.getVisibleStartHour()
-                        + (row / 2)), null);
+                                                + (row / 2)), null);
                 writer.endElement(HTML.SPAN_ELEM);
                 writer.startElement(HTML.SPAN_ELEM, schedule);
-                writer.writeAttribute(HTML.CLASS_ATTR, getStyleClass(schedule,
-                        "minutes"), null);
+                writer.writeAttribute(HTML.CLASS_ATTR, getStyleClass(schedule, "minutes"), null);
                 writer.writeAttribute(HTML.STYLE_ATTR,
-                        "vertical-align: top; height: 100%; padding: 0px;",
-                        null);
+                                      "vertical-align: top; height: 100%; padding: 0px;",
+                                      null);
                 writer.writeText("00", null);
                 writer.endElement(HTML.SPAN_ELEM);
                 writer.endElement(HTML.TD_ELEM);
@@ -376,12 +356,12 @@
             {
                 writer.startElement(HTML.TD_ELEM, schedule);
                 writer.writeAttribute(HTML.CLASS_ATTR, getCellClass(schedule,
-                        column, row), null);
+                                                                    column, row), null);
                 writer.writeAttribute(HTML.STYLE_ATTR,
-                        "overflow: hidden; height: " + rowHeight + "px;", null);
+                                      "overflow: hidden; height: 21px;", null);
                 writer.writeAttribute(HTML.WIDTH_ATTR, String
                         .valueOf(columnWidth)
-                        + "%", null);
+                                                       + "%", null);
                 writer.write(HTML.NBSP_ENTITY);
                 writer.endElement(HTML.TD_ELEM);
             }
@@ -395,14 +375,14 @@
     }
 
     private void writeEntries(FacesContext context, HtmlSchedule schedule,
-            ScheduleDay day, ResponseWriter writer) throws IOException
+                              ScheduleDay day, ResponseWriter writer) throws IOException
     {
         TreeSet entrySet = new TreeSet();
 
         for (Iterator entryIterator = day.iterator(); entryIterator.hasNext();)
         {
             entrySet.add(new EntryWrapper((ScheduleEntry) entryIterator.next(),
-                    day));
+                                          day));
         }
 
         EntryWrapper[] entries = (EntryWrapper[]) entrySet
@@ -440,10 +420,8 @@
             //compose the CSS style for the entry box
             StringBuffer entryStyle = new StringBuffer();
             entryStyle.append(wrapper.getBounds(schedule, columnWidth));
-            String entryBorderColor = getEntryRenderer(schedule).getColor(
-                    context, schedule, wrapper.entry, selected);
-            if (entryBorderColor != null)
-            {
+            String entryBorderColor = getEntryRenderer(schedule).getColor(context, schedule, wrapper.entry, selected);
+            if (entryBorderColor != null) {
                 entryStyle.append(" border-color: ");
                 entryStyle.append(entryBorderColor);
                 entryStyle.append(";");
@@ -452,21 +430,17 @@
             if (selected)
             {
                 writer.startElement(HTML.DIV_ELEM, schedule);
-                writer.writeAttribute(HTML.CLASS_ATTR, getStyleClass(schedule,
-                        "entry-selected"), null);
-                writer.writeAttribute(HTML.STYLE_ATTR, entryStyle.toString(),
-                        null);
+                writer.writeAttribute(HTML.CLASS_ATTR, getStyleClass(schedule, "entry-selected"), null);
+                writer.writeAttribute(HTML.STYLE_ATTR, entryStyle.toString(), null);
 
                 //draw the tooltip
                 if (showTooltip(schedule))
                 {
-                    getEntryRenderer(schedule).renderToolTip(context, writer,
-                            schedule, wrapper.entry, selected);
+                    getEntryRenderer(schedule).renderToolTip(context, writer, schedule, wrapper.entry, selected);
                 }
 
                 //draw the content
-                getEntryRenderer(schedule).renderContent(context, writer,
-                        schedule, day, wrapper.entry, false, selected);
+                getEntryRenderer(schedule).renderContent(context, writer, schedule, day, wrapper.entry, false, selected);
                 writer.endElement(HTML.DIV_ELEM);
             }
             else
@@ -479,8 +453,7 @@
                 //draw the tooltip
                 if (showTooltip(schedule))
                 {
-                    getEntryRenderer(schedule).renderToolTip(context, writer,
-                            schedule, wrapper.entry, selected);
+                    getEntryRenderer(schedule).renderToolTip(context, writer, schedule, wrapper.entry, selected);
                 }
 
                 if (!schedule.isReadonly())
@@ -499,17 +472,14 @@
                     mousedown.append(parentForm.getClientId(context));
                     mousedown.append("'].submit()");
                     writer.writeAttribute("onmousedown", mousedown.toString(),
-                            null);
+                                          null);
                 }
 
-                writer.writeAttribute(HTML.CLASS_ATTR, getStyleClass(schedule,
-                        "entry"), null);
-                writer.writeAttribute(HTML.STYLE_ATTR, entryStyle.toString(),
-                        null);
+                writer.writeAttribute(HTML.CLASS_ATTR, getStyleClass(schedule, "entry"), null);
+                writer.writeAttribute(HTML.STYLE_ATTR, entryStyle.toString(), null);
 
                 //draw the content
-                getEntryRenderer(schedule).renderContent(context, writer,
-                        schedule, day, wrapper.entry, false, selected);
+                getEntryRenderer(schedule).renderContent(context, writer, schedule, day, wrapper.entry, false, selected);
 
                 writer.endElement(schedule.isReadonly() ? HTML.DIV_ELEM : "a");
             }
@@ -517,7 +487,7 @@
     }
 
     private void writeForegroundEnd(FacesContext context,
-            HtmlSchedule schedule, ResponseWriter writer) throws IOException
+                                    HtmlSchedule schedule, ResponseWriter writer) throws IOException
     {
         writer.endElement(HTML.TR_ELEM);
         writer.endElement(HTML.TABLE_ELEM);
@@ -525,13 +495,10 @@
     }
 
     private void writeForegroundStart(FacesContext context,
-            HtmlSchedule schedule, ResponseWriter writer) throws IOException
+                                      HtmlSchedule schedule, ResponseWriter writer) throws IOException
     {
-        final int rowHeight = getRowHeight(schedule.getAttributes()) - 1;
-        final int headerHeight = rowHeight + 10;
         writer.startElement(HTML.DIV_ELEM, schedule);
-        writer.writeAttribute(HTML.CLASS_ATTR, getStyleClass(schedule,
-                "foreground"), null);
+        writer.writeAttribute(HTML.CLASS_ATTR, getStyleClass(schedule, "foreground"), null);
         writer
                 .writeAttribute(
                         HTML.STYLE_ATTR,
@@ -539,38 +506,36 @@
                         null);
 
         writer.startElement(HTML.TABLE_ELEM, schedule);
-        writer.writeAttribute(HTML.CLASS_ATTR, getStyleClass(schedule,
-                "foreground"), null);
+        writer.writeAttribute(HTML.CLASS_ATTR, getStyleClass(schedule, "foreground"), null);
         writer.writeAttribute(HTML.CELLSPACING_ATTR, "1", null);
         writer.writeAttribute(HTML.CELLPADDING_ATTR, "0", null);
         writer.writeAttribute(HTML.STYLE_ATTR, "width: 100%; height: 100%",
-                null);
+                              null);
         writer.startElement(HTML.TR_ELEM, schedule);
         writer.startElement(HTML.TD_ELEM, schedule);
         writer.startElement(HTML.DIV_ELEM, schedule);
         writer
                 .writeAttribute(HTML.STYLE_ATTR, "height: 1px; width: 56px",
-                        null);
+                                null);
         writer.endElement(HTML.DIV_ELEM);
         writer.endElement(HTML.TD_ELEM);
 
         float columnWidth = (schedule.getModel().size() == 0) ? 100
-                : (100 / schedule.getModel().size());
+                            : (100 / schedule.getModel().size());
 
         for (Iterator dayIterator = schedule.getModel().iterator(); dayIterator
                 .hasNext();)
         {
             ScheduleDay day = (ScheduleDay) dayIterator.next();
             writer.startElement(HTML.TD_ELEM, schedule);
-            writer.writeAttribute(HTML.CLASS_ATTR, getStyleClass(schedule,
-                    "header"), null);
+            writer.writeAttribute(HTML.CLASS_ATTR, getStyleClass(schedule, "header"), null);
             writer
                     .writeAttribute(
                             HTML.STYLE_ATTR,
-                            "height: " + headerHeight + "px; border-style: none; border-width: 0px; overflow: hidden;",
+                            "height: 31px; border-style: none; border-width: 0px; overflow: hidden;",
                             null);
             writer.writeAttribute(HTML.WIDTH_ATTR, String.valueOf(columnWidth)
-                    + "%", null);
+                                                   + "%", null);
 
             writer.endElement(HTML.TD_ELEM);
         }
@@ -582,23 +547,13 @@
         writer.startElement(HTML.DIV_ELEM, schedule);
         writer
                 .writeAttribute(HTML.STYLE_ATTR, "height: 1px; width: 56px",
-                        null);
+                                null);
         writer.endElement(HTML.DIV_ELEM);
         writer.endElement(HTML.TD_ELEM);
     }
 
     //~ Inner Classes ----------------------------------------------------------
 
-    protected String getRowHeightProperty()
-    {
-        return "detailedRowHeight";
-    }
-
-    protected int getDefaultRowHeight()
-    {
-        return defaultRowHeightInPixels;
-    }
-
     private class EntryWrapper implements Comparable
     {
         //~ Static fields/initializers -----------------------------------------
@@ -645,9 +600,9 @@
 
                 boolean returnboolean = (entry.getStartTime()
                         .equals(other.entry.getStartTime()))
-                        && (entry.getEndTime().equals(other.entry.getEndTime()))
-                        && (entry.getId().equals(other.entry.getId()))
-                        && (day.equals(other.day));
+                                        && (entry.getEndTime().equals(other.entry.getEndTime()))
+                                        && (entry.getId().equals(other.entry.getId()))
+                                        && (day.equals(other.day));
                 /*
                  new EqualsBuilder().append(
                  entry.getStartTime(), other.entry.getStartTime()
@@ -668,7 +623,7 @@
         public int hashCode()
         {
             int returnint = entry.getStartTime().hashCode()
-                    ^ entry.getEndTime().hashCode() ^ entry.getId().hashCode();
+                            ^ entry.getEndTime().hashCode() ^ entry.getId().hashCode();
 
             return returnint;
         }
@@ -685,7 +640,6 @@
          */
         String getBounds(HtmlSchedule schedule, float columnWidth)
         {
-            int rowHeight = getRowHeight(schedule.getAttributes());
             float width = (columnWidth * colspan) - 0.5f;
             float left = column * columnWidth;
             Calendar cal = GregorianCalendar.getInstance();
@@ -720,8 +674,8 @@
             endMillis = day.equalsDate(entry.getEndTime()) ? Math.min(
                     endMillis, visibleEndMillis) : visibleEndMillis;
 
-            int top = (int) (((startMillis - visibleStartMillis) * rowHeight) / HALF_HOUR);
-            int height = (int) (((endMillis - startMillis) * rowHeight) / HALF_HOUR);
+            int top = (int) (((startMillis - visibleStartMillis) * rowHeightInPixels) / HALF_HOUR);
+            int height = (int) (((endMillis - startMillis) * rowHeightInPixels) / HALF_HOUR);
             StringBuffer buffer = new StringBuffer();
 
             if (height <= 0)

Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/scope/ScopeTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/scope/ScopeTag.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/scope/ScopeTag.java (original)
+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/scope/ScopeTag.java Fri Feb 24 07:47:18 2006
@@ -18,7 +18,7 @@
 
 import javax.faces.component.UIComponent;
 
-import org.apache.myfaces.taglib.UIComponentTagBase;
+import org.apache.myfaces.shared.taglib.UIComponentTagBase;
 
 /**
  * A class very similar to savestate it allows to defined scopes for variables



Mime
View raw message