You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2009/11/20 15:31:17 UTC
svn commit: r882572 - in /myfaces/tobago/trunk:
core/src/main/java/org/apache/myfaces/tobago/component/
core/src/main/java/org/apache/myfaces/tobago/taglib/component/
core/src/test/java/org/apache/myfaces/tobago/component/
example/addressbook/lib/src/m...
Author: lofwyr
Date: Fri Nov 20 14:31:16 2009
New Revision: 882572
URL: http://svn.apache.org/viewvc?rev=882572&view=rev
Log:
TOBAGO-412: Cleanup
- rename UIData to UISheet because of naming conventions
Added:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUISheet.java (contents, props changed)
- copied, changed from r882081, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIData.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIData.java
myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/UISheetUnitTest.java (contents, props changed)
- copied, changed from r882081, myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/UIDataUnitTest.java
Removed:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIData.java
myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/UIDataUnitTest.java
Modified:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ColumnTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SheetTagDeclaration.java
myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Controller.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/PopupReferenceController.java
myfaces/tobago/trunk/extension/deprecation/src/main/java/org/apache/myfaces/tobago/component/ComponentUtil.java
myfaces/tobago/trunk/extension/deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtil.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/SortActionEvent.java
Copied: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUISheet.java (from r882081, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIData.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUISheet.java?p2=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUISheet.java&p1=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIData.java&r1=882081&r2=882572&rev=882572&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIData.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUISheet.java Fri Nov 20 14:31:16 2009
@@ -54,11 +54,11 @@
import java.util.List;
import java.util.Map;
-public abstract class AbstractUIData extends javax.faces.component.UIData
+public abstract class AbstractUISheet extends javax.faces.component.UIData
implements SheetStateChangeSource, SortActionSource, AjaxComponent, InvokeOnComponent, OnComponentPopulated,
LayoutContainer, LayoutComponent {
- private static final Log LOG = LogFactory.getLog(AbstractUIData.class);
+ private static final Log LOG = LogFactory.getLog(AbstractUISheet.class);
public static final String COMPONENT_TYPE = "org.apache.myfaces.tobago.Data";
@@ -417,7 +417,7 @@
public boolean invokeOnComponent(FacesContext context, String clientId, ContextCallback callback)
throws FacesException {
- // we may need setRowIndex on UIData
+ // we may need setRowIndex on UISheet
int oldRowIndex = getRowIndex();
try {
String sheetId = getClientId(context);
@@ -449,7 +449,7 @@
return FacesUtils.invokeOnComponent(context, this, clientId, callback);
} finally {
- // we should reset rowIndex on UIData
+ // we should reset rowIndex on UISheet
setRowIndex(oldRowIndex);
}
}
Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUISheet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUISheet.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java?rev=882572&r1=882571&r2=882572&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java Fri Nov 20 14:31:16 2009
@@ -57,7 +57,7 @@
LOG.debug("sorterId = " + sortEvent.getComponent().getId());
}
UIColumn column = sortEvent.getColumn();
- AbstractUIData data = (AbstractUIData) sortEvent.getComponent();
+ AbstractUISheet data = (AbstractUISheet) sortEvent.getComponent();
Object value = data.getValue();
if (value instanceof DataModel) {
Added: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIData.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIData.java?rev=882572&view=auto
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIData.java (added)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIData.java Fri Nov 20 14:31:16 2009
@@ -0,0 +1,29 @@
+package org.apache.myfaces.tobago.component;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.myfaces.tobago.ajax.api.AjaxComponent;
+import org.apache.myfaces.tobago.event.SortActionSource;
+import org.apache.myfaces.tobago.event.SortActionSource2;
+
+/**
+ * @deprecated Please use UISheet
+ */
+public interface UIData extends SortActionSource2, AjaxComponent, SupportsMarkup, SortActionSource {
+
+}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ColumnTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ColumnTagDeclaration.java?rev=882572&r1=882571&r2=882572&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ColumnTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ColumnTagDeclaration.java Fri Nov 20 14:31:16 2009
@@ -28,7 +28,7 @@
/**
* Renders a UIComponent that represents a single column of data within a
- * parent UIData component.
+ * parent UISheet component.
*/
@Tag(name = "column")
@UIComponentTag(
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SheetTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SheetTagDeclaration.java?rev=882572&r1=882571&r2=882572&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SheetTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SheetTagDeclaration.java Fri Nov 20 14:31:16 2009
@@ -37,8 +37,8 @@
@Tag(name = "sheet")
@BodyContentDescription(anyTagOf = "<tc:column>* <tc:columnSelector>?")
@UIComponentTag(
- uiComponent = "org.apache.myfaces.tobago.component.UIData",
- uiComponentBaseClass = "org.apache.myfaces.tobago.component.AbstractUIData",
+ uiComponent = "org.apache.myfaces.tobago.component.UISheet",
+ uiComponentBaseClass = "org.apache.myfaces.tobago.component.AbstractUISheet",
interfaces = { "org.apache.myfaces.tobago.ajax.api.AjaxComponent",
"org.apache.myfaces.tobago.event.SortActionSource" },
rendererType = RendererTypes.SHEET,
Copied: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/UISheetUnitTest.java (from r882081, myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/UIDataUnitTest.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/UISheetUnitTest.java?p2=myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/UISheetUnitTest.java&p1=myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/UIDataUnitTest.java&r1=882081&r2=882572&rev=882572&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/UIDataUnitTest.java (original)
+++ myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/UISheetUnitTest.java Fri Nov 20 14:31:16 2009
@@ -25,7 +25,7 @@
import java.util.Arrays;
import java.util.List;
-public class UIDataUnitTest {
+public class UISheetUnitTest {
String[] nineRows =
{"one", "two", "three", "four", "five",
"six", "seven", "eight", "nine"};
@@ -34,7 +34,7 @@
public void testPage() {
List<String> list = new ArrayList<String>();
list.addAll(Arrays.asList(nineRows));
- UIData data = new UIData();
+ UISheet data = new UISheet();
data.setValue(new ListDataModel(list));
data.setRows(5);
Assert.assertEquals(1, data.getPage());
Propchange: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/UISheetUnitTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/UISheetUnitTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Controller.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Controller.java?rev=882572&r1=882571&r2=882572&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Controller.java (original)
+++ myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Controller.java Fri Nov 20 14:31:16 2009
@@ -26,7 +26,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.tobago.component.UIColumn;
-import org.apache.myfaces.tobago.component.UIData;
+import org.apache.myfaces.tobago.component.UISheet;
import org.apache.myfaces.tobago.config.TobagoConfig;
import org.apache.myfaces.tobago.context.ClientProperties;
import org.apache.myfaces.tobago.context.Theme;
@@ -124,7 +124,7 @@
SortActionEvent sortEvent = (SortActionEvent) event;
UIColumn column = (UIColumn) sortEvent.getColumn();
- SheetState sheetState = ((UIData) sortEvent.getSheet()).getSheetState(FacesContext.getCurrentInstance());
+ SheetState sheetState = ((UISheet) sortEvent.getSheet()).getSheetState(FacesContext.getCurrentInstance());
currentAddressList = addressDao.findAddresses(searchCriterion, column.getId(), sheetState.isAscending());
}
}
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/PopupReferenceController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/PopupReferenceController.java?rev=882572&r1=882571&r2=882572&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/PopupReferenceController.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/PopupReferenceController.java Fri Nov 20 14:31:16 2009
@@ -19,13 +19,12 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.tobago.component.UISheet;
-import org.apache.myfaces.tobago.component.UIData;
-
-import javax.faces.event.ActionEvent;
import javax.faces.component.UIComponent;
-import java.util.List;
+import javax.faces.event.ActionEvent;
import java.util.ArrayList;
+import java.util.List;
public class PopupReferenceController {
@@ -49,11 +48,11 @@
public void selectEntry(ActionEvent event) {
UIComponent component = event.getComponent();
- while (!(component instanceof UIData)) {
+ while (!(component instanceof UISheet)) {
component = component.getParent();
}
- UIData sheet = (UIData) component;
+ UISheet sheet = (UISheet) component;
entry = (Entry) sheet.getRowData();
LOG.info("entry = \"" + entry.getColumn1() + "\"");
}
Modified: myfaces/tobago/trunk/extension/deprecation/src/main/java/org/apache/myfaces/tobago/component/ComponentUtil.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/deprecation/src/main/java/org/apache/myfaces/tobago/component/ComponentUtil.java?rev=882572&r1=882571&r2=882572&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/deprecation/src/main/java/org/apache/myfaces/tobago/component/ComponentUtil.java (original)
+++ myfaces/tobago/trunk/extension/deprecation/src/main/java/org/apache/myfaces/tobago/component/ComponentUtil.java Fri Nov 20 14:31:16 2009
@@ -382,7 +382,7 @@
ComponentUtils.setValueBinding(component, name, state);
}
- public static void setStateChangeListener(UIData data, String stateChangeListener) {
+ public static void setStateChangeListener(UISheet data, String stateChangeListener) {
final FacesContext facesContext = FacesContext.getCurrentInstance();
final Application application = facesContext.getApplication();
Modified: myfaces/tobago/trunk/extension/deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtil.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtil.java?rev=882572&r1=882571&r2=882572&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtil.java (original)
+++ myfaces/tobago/trunk/extension/deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtil.java Fri Nov 20 14:31:16 2009
@@ -24,7 +24,6 @@
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.SupportsMarkup;
import org.apache.myfaces.tobago.component.UICommand;
-import org.apache.myfaces.tobago.component.UIData;
import org.apache.myfaces.tobago.component.UIPage;
import org.apache.myfaces.tobago.context.ResourceManagerUtil;
import org.apache.myfaces.tobago.context.TobagoFacesContext;
@@ -42,6 +41,7 @@
import javax.faces.component.NamingContainer;
import javax.faces.component.UIComponent;
+import javax.faces.component.UIData;
import javax.faces.component.UIInput;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java?rev=882572&r1=882571&r2=882572&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java Fri Nov 20 14:31:16 2009
@@ -32,10 +32,10 @@
import org.apache.myfaces.tobago.component.UIColumnEvent;
import org.apache.myfaces.tobago.component.UIColumnSelector;
import org.apache.myfaces.tobago.component.UICommand;
-import org.apache.myfaces.tobago.component.UIData;
import org.apache.myfaces.tobago.component.UIMenu;
import org.apache.myfaces.tobago.component.UIMenuCommand;
import org.apache.myfaces.tobago.component.UIReload;
+import org.apache.myfaces.tobago.component.UISheet;
import org.apache.myfaces.tobago.config.ThemeConfig;
import org.apache.myfaces.tobago.config.TobagoConfig;
import org.apache.myfaces.tobago.context.ResourceManager;
@@ -79,7 +79,7 @@
import java.util.Map;
import static org.apache.myfaces.tobago.TobagoConstants.SUBCOMPONENT_SEP;
-import static org.apache.myfaces.tobago.component.UIData.NONE;
+import static org.apache.myfaces.tobago.component.UISheet.NONE;
public class SheetRenderer extends LayoutComponentRendererBase implements AjaxRenderer {
@@ -102,7 +102,7 @@
public void encodeEnd(FacesContext facesContext, UIComponent uiComponent) throws IOException {
- UIData data = (UIData) uiComponent;
+ UISheet data = (UISheet) uiComponent;
storeFooterHeight(facesContext, data);
Style style = new Style(facesContext, data);
@@ -175,7 +175,7 @@
HtmlRendererUtils.writeScriptLoader(facesContext, SCRIPTS, cmds);
}
- private void renderSheet(FacesContext facesContext, UIData data, boolean hasClickAction, Style style)
+ private void renderSheet(FacesContext facesContext, UISheet data, boolean hasClickAction, Style style)
throws IOException {
TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
ResourceManager resourceManager = ResourceManagerFactory.getResourceManager(facesContext);
@@ -545,7 +545,7 @@
}
}
- private String createSheetPagingInfo(UIData data,
+ private String createSheetPagingInfo(UISheet data,
FacesContext facesContext, String pagerCommandId, boolean row) {
String sheetPagingInfo;
if (data.getRowCount() > 0) {
@@ -625,7 +625,7 @@
}
- private boolean needVerticalScrollbar(FacesContext facesContext, UIData data, Style style) {
+ private boolean needVerticalScrollbar(FacesContext facesContext, UISheet data, Style style) {
// estimate need of height-scrollbar on client, if yes we have to consider
// this when calculating column width's
@@ -655,19 +655,19 @@
}
}
- private Measure getRowPadding(FacesContext facesContext, UIData data) {
+ private Measure getRowPadding(FacesContext facesContext, UISheet data) {
return ThemeConfig.getMeasure(facesContext, data, "rowPadding");
}
- private Measure getScrollbarWidth(FacesContext facesContext, UIData data) {
+ private Measure getScrollbarWidth(FacesContext facesContext, UISheet data) {
return ThemeConfig.getMeasure(facesContext, data, "scrollbarWidth");
}
- private void storeFooterHeight(FacesContext facesContext, UIData data) {
+ private void storeFooterHeight(FacesContext facesContext, UISheet data) {
data.getAttributes().put(Attributes.FOOTER_HEIGHT, getFooterHeight(facesContext, data));
}
- private Measure getFooterHeight(FacesContext facesContext, UIData data) {
+ private Measure getFooterHeight(FacesContext facesContext, UISheet data) {
// todo: use Measure instead of int
Measure footerHeight;
if (isValidPagingAttribute(data, Attributes.SHOW_ROW_RANGE)
@@ -681,11 +681,11 @@
return footerHeight;
}
- private boolean isValidPagingAttribute(UIData component, String name) {
+ private boolean isValidPagingAttribute(UISheet component, String name) {
return isValidPagingValue(getPagingAttribute(component, name));
}
- private String getPagingAttribute(UIData component, String name) {
+ private String getPagingAttribute(UISheet component, String name) {
String value = ComponentUtils.getStringAttribute(component, name);
if (isValidPagingValue(value)) {
return value;
@@ -703,7 +703,7 @@
|| "right".equals(value);
}
- private Measure getAscendingMarkerWidth(FacesContext facesContext, UIData data) {
+ private Measure getAscendingMarkerWidth(FacesContext facesContext, UISheet data) {
return ThemeConfig.getMeasure(facesContext, data, "ascendingMarkerWidth");
}
@@ -711,7 +711,7 @@
return true;
}
- private List<Integer> getSelectedRows(UIData data, SheetState state) {
+ private List<Integer> getSelectedRows(UISheet data, SheetState state) {
List<Integer> selected = (List<Integer>)
data.getAttributes().get(Attributes.SELECTED_LIST_STRING);
if (selected == null && state != null) {
@@ -724,7 +724,7 @@
}
private void link(FacesContext facesContext, Application application,
- boolean disabled, PageAction command, UIData data)
+ boolean disabled, PageAction command, UISheet data)
throws IOException {
UICommand link = createPagingCommand(application, command, disabled);
@@ -754,7 +754,7 @@
}
private void renderColumnHeader(FacesContext facesContext,
- TobagoResponseWriter writer, UIData component,
+ TobagoResponseWriter writer, UISheet component,
int columnIndex, UIColumn column, String imageAscending, String imageDescending, String imageUnsorted,
String image1x1, Measure sortMarkerWidth) throws IOException {
String sheetId = component.getClientId(facesContext);
@@ -783,7 +783,7 @@
UICommand sortCommand = (UICommand) column.getFacet(Facets.SORTER);
if (sortCommand == null) {
String columnId = column.getClientId(facesContext);
- String sorterId = columnId.substring(columnId.lastIndexOf(":") + 1) + "_" + UIData.SORTER_ID;
+ String sorterId = columnId.substring(columnId.lastIndexOf(":") + 1) + "_" + UISheet.SORTER_ID;
sortCommand = (UICommand) application.createComponent(UICommand.COMPONENT_TYPE);
sortCommand.setRendererType(RendererTypes.LINK);
sortCommand.setId(sorterId);
@@ -875,7 +875,7 @@
protected void renderColumnSelectorHeader(FacesContext facesContext,
- TobagoResponseWriter writer, UIData component, UIColumn column)
+ TobagoResponseWriter writer, UISheet component, UIColumn column)
throws IOException {
UIPanel menu = (UIPanel) column.getFacet(Facets.MENUPOPUP);
if (menu == null) {
@@ -912,7 +912,7 @@
menu.getChildren().add(menuItem);
}
- menu.setRendered(UIData.MULTI.equals(component.getSelectable()));
+ menu.setRendered(UISheet.MULTI.equals(component.getSelectable()));
writer.startElement(HtmlConstants.DIV, null);
writer.writeIdAttribute(column.getClientId(facesContext));
@@ -954,7 +954,7 @@
}
private void writeDirectPagingLinks(
- TobagoResponseWriter writer, FacesContext facesContext, Application application, UIData data)
+ TobagoResponseWriter writer, FacesContext facesContext, Application application, UISheet data)
throws IOException {
UICommand pagerCommand = (UICommand) data.getFacet(Facets.PAGER_PAGE);
if (pagerCommand == null) {
@@ -1076,16 +1076,16 @@
writer.endElement(type);
}
- private Measure getContentBorder(FacesContext facesContext, UIData data) {
+ private Measure getContentBorder(FacesContext facesContext, UISheet data) {
return ThemeConfig.getMeasure(facesContext, data, "contentBorder");
}
public void encodeAjax(FacesContext facesContext, UIComponent component) throws IOException {
- UIData data = (UIData) component;
+ UISheet data = (UISheet) component;
Style style = new Style(facesContext, data);
- AjaxUtils.checkParamValidity(facesContext, data, UIData.class);
+ AjaxUtils.checkParamValidity(facesContext, data, UISheet.class);
// TODO find a better way
UICommand clickAction = null;
UICommand dblClickAction = null;
@@ -1115,7 +1115,7 @@
// DO Nothing
}
- private void ensureColumnWidthList(FacesContext facesContext, UIData data, Style style) {
+ private void ensureColumnWidthList(FacesContext facesContext, UISheet data, Style style) {
List<Integer> currentWidthList = null;
List<UIColumn> rendererdColumns = data.getRenderedColumns();
Modified: myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java?rev=882572&r1=882571&r2=882572&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java (original)
+++ myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java Fri Nov 20 14:31:16 2009
@@ -24,8 +24,8 @@
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.SupportsMarkup;
import org.apache.myfaces.tobago.component.UICommand;
-import org.apache.myfaces.tobago.component.UIData;
import org.apache.myfaces.tobago.component.UIPage;
+import org.apache.myfaces.tobago.component.UISheet;
import org.apache.myfaces.tobago.context.ResourceManagerUtil;
import org.apache.myfaces.tobago.context.TobagoFacesContext;
import org.apache.myfaces.tobago.renderkit.LabelWithAccessKey;
@@ -438,8 +438,8 @@
UIComponent partiallyComponent = ComponentUtils.findComponent(component, componentId);
if (partiallyComponent != null) {
String clientId = partiallyComponent.getClientId(context);
- if (partiallyComponent instanceof UIData) {
- int rowIndex = ((UIData) partiallyComponent).getRowIndex();
+ if (partiallyComponent instanceof UISheet) {
+ int rowIndex = ((UISheet) partiallyComponent).getRowIndex();
if (rowIndex >= 0 && clientId.endsWith(Integer.toString(rowIndex))) {
return clientId.substring(0, clientId.lastIndexOf(NamingContainer.SEPARATOR_CHAR));
}
Modified: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/SortActionEvent.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/SortActionEvent.java?rev=882572&r1=882571&r2=882572&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/SortActionEvent.java (original)
+++ myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/SortActionEvent.java Fri Nov 20 14:31:16 2009
@@ -35,9 +35,7 @@
}
/**
- * Returns the UIColumn object for which this event is triggert.
- *
- * @return UIColumn
+ * @return UIColumn The UIColumn object for which this event was triggered.
*/
public UIColumn getColumn() {
return column;