Author: nbelaevski Date: 2008-08-01 12:35:20 -0400 (Fri, 01 Aug 2008) New Revision: 9868 Modified: trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/component/UIExtendedDataTable.java trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/component/UIExtendedDataTableState.java trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/AbstractExtendedRowsRenderer.java trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/html/DraggableRendererContributor.java trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/html/TableMenuRenderer.java trunk/sandbox/ui/extendedDataTable/src/main/templates/org/richfaces/htmlExtendedDataTable.jspx Log: TODOs committed Modified: trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/component/UIExtendedDataTable.java =================================================================== --- trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/component/UIExtendedDataTable.java 2008-08-01 15:52:49 UTC (rev 9867) +++ trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/component/UIExtendedDataTable.java 2008-08-01 16:35:20 UTC (rev 9868) @@ -48,6 +48,7 @@ */ public static final String COMPONENT_FAMILY = "org.richfaces.ExtendedDataTable"; + //TODO nick - please rename this class to indicate that's not the instance of UIComponent protected UIExtendedDataTableState state; public abstract Object getActiveRowKey(); @@ -57,6 +58,7 @@ public void broadcast(FacesEvent event) throws AbortProcessingException { super.broadcast(event); if (event instanceof AjaxEvent) { + //TODO nick - add regions from component too AjaxContext.getCurrentInstance().addComponentToAjaxRender(this); } else if (event instanceof DragDropEvent) { processDradDrop((DragDropEvent) event); @@ -73,6 +75,8 @@ } public void queueEvent(FacesEvent event) { + //TODO nick - queued events can be bubbled from nested component and not generated + // by the table itself. Please check source of the event! if (event instanceof AjaxEvent) { event.setPhaseId(PhaseId.APPLY_REQUEST_VALUES); } else if (event instanceof DragDropEvent) { @@ -223,6 +227,8 @@ if (isGroupingOn()) {// grouping is on String groupColId = getGroupingColumnId(); // try to add group column id as first + + //TODO nick - is it ok to change user's priorities collection here? if (priority.contains(groupColId)) { priority.remove(groupColId); } @@ -317,6 +323,7 @@ * RENDER_RESPONSE phase. In that version data model is reseted which causes * need to sort and filter every time component is rendered. In this */ + //TODO nick - that's needed because component can be switched to another data model // @Override protected void resetDataModel() { // Do nothing! Modified: trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/component/UIExtendedDataTableState.java =================================================================== --- trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/component/UIExtendedDataTableState.java 2008-08-01 15:52:49 UTC (rev 9867) +++ trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/component/UIExtendedDataTableState.java 2008-08-01 16:35:20 UTC (rev 9868) @@ -287,6 +287,7 @@ } private String formatWidth(String value){ + //TODO nick - use org.ajax4jsf.util.HtmlDimensions.decode(String) if(value.endsWith("px")) return value.substring(0,value.indexOf("px")); return value; Modified: trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/AbstractExtendedRowsRenderer.java =================================================================== --- trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/AbstractExtendedRowsRenderer.java 2008-08-01 15:52:49 UTC (rev 9867) +++ trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/AbstractExtendedRowsRenderer.java 2008-08-01 16:35:20 UTC (rev 9868) @@ -36,12 +36,6 @@ import org.ajax4jsf.renderkit.RendererUtils.HTML; import org.ajax4jsf.resource.InternetResource; import org.richfaces.component.Row; -import org.richfaces.renderkit.AbstractRowsRenderer; -import org.richfaces.renderkit.CompositeRenderer; -import org.richfaces.renderkit.RendererContributor; -import org.richfaces.renderkit.ScriptOptions; -import org.richfaces.renderkit.TableHolder; - import org.richfaces.component.UIExtendedDataTable; import org.richfaces.renderkit.html.TableSelectionRendererContributor; @@ -53,6 +47,9 @@ HeaderResourcesRendererBase implements DataVisitor { protected static final String MENU_ID = "_TABLE_MENU_ID_"; + + //TODO nick - renderer classes are singletons by nature, they should not have + // non-static/non-final fields protected boolean firstRow = true; protected class CompositeRendererEnabler extends CompositeRenderer { @@ -211,7 +208,9 @@ "captionStyle"); writer.startElement("caption", table); if (captionClass != null) { - captionClass = "extdt-caption rich-extdt-caption " + //TODO nick - dr-* classes are legacy and can be removed safely. + // CSS styling can be defined in rich-* classes instead + captionClass = "extdt-caption rich-extdt-caption " + captionClass; } else { captionClass = "extdt-caption rich-extdt-caption"; @@ -261,6 +260,7 @@ protected void encodeStyleClass(ResponseWriter writer, Object parentPredefined, Object predefined, Object parent, Object custom) throws IOException { + //TODO nick - StringBuilder is more performant StringBuffer styleClass = new StringBuffer(); // Construct predefined classes if (null != parentPredefined) { Modified: trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/html/DraggableRendererContributor.java =================================================================== --- trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/html/DraggableRendererContributor.java 2008-08-01 15:52:49 UTC (rev 9867) +++ trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/html/DraggableRendererContributor.java 2008-08-01 16:35:20 UTC (rev 9868) @@ -26,6 +26,8 @@ * @author pawelgo * */ + +//TODO nick - please rename classes & resources to prevent collisions with RF classes!! public class DraggableRendererContributor implements RendererContributor { private static DraggableRendererContributor instance; Modified: trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/html/TableMenuRenderer.java =================================================================== --- trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/html/TableMenuRenderer.java 2008-08-01 15:52:49 UTC (rev 9867) +++ trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/html/TableMenuRenderer.java 2008-08-01 16:35:20 UTC (rev 9868) @@ -107,6 +107,7 @@ protected String getFacesResourceURL(FacesContext context, String Url) { WebXml webXml = WebXml.getInstance(context); StringBuffer buf = new StringBuffer(); + //TODO nick - use InternetResourceBuilder buf.append(webXml.getResourcePrefix()).append(Url); // Insert suffix mapping if (webXml.isPrefixMapping()) { Modified: trunk/sandbox/ui/extendedDataTable/src/main/templates/org/richfaces/htmlExtendedDataTable.jspx =================================================================== --- trunk/sandbox/ui/extendedDataTable/src/main/templates/org/richfaces/htmlExtendedDataTable.jspx 2008-08-01 15:52:49 UTC (rev 9867) +++ trunk/sandbox/ui/extendedDataTable/src/main/templates/org/richfaces/htmlExtendedDataTable.jspx 2008-08-01 16:35:20 UTC (rev 9868) @@ -52,6 +52,11 @@ ]]> </jsp:scriptlet> + <!-- + TODO nick - enclose all HTML elements into one container element or add them + to rendered areas manually in order to be handled correctly by AJAX updates + --> + <div id="#{clientId}:dataTable_indicator" class="drgind_fly drgind_default drag_indicator" style="display: none;" > <f:call name="encodeNamespace" />