Author: nbelaevski Date: 2010-05-13 17:47:44 -0400 (Thu, 13 May 2010) New Revision: 17041 Modified: root/ui-sandbox/tables/trunk/impl/src/test/java/org/richfaces/model/ArrangeableModelTest.java root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/UIExtendedDataTable.java root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java root/ui-sandbox/tables/trunk/ui/src/test/java/org/richfaces/component/UIColumnTest.java root/ui-sandbox/tables/trunk/ui/src/test/java/org/richfaces/component/UIDataTableBaseTest.java root/ui-sandbox/tables/trunk/ui/src/test/java/org/richfaces/component/UIExtendedDataTableTest.java Log: Removed @Override usage for interfaces Modified: root/ui-sandbox/tables/trunk/impl/src/test/java/org/richfaces/model/ArrangeableModelTest.java =================================================================== --- root/ui-sandbox/tables/trunk/impl/src/test/java/org/richfaces/model/ArrangeableModelTest.java 2010-05-13 20:53:52 UTC (rev 17040) +++ root/ui-sandbox/tables/trunk/impl/src/test/java/org/richfaces/model/ArrangeableModelTest.java 2010-05-13 21:47:44 UTC (rev 17041) @@ -91,7 +91,6 @@ ExpressionFactory expressionFactory = facesContext.getApplication().getExpressionFactory(); ELContext elContext = facesContext.getELContext(); FilterField[] filterFields = {new FilterField(null, new Filter<User>() { - @Override public boolean accept(User t) { return t.getFname().indexOf('a') == -1; } @@ -100,7 +99,6 @@ SortField[] sortFields = {new SortField(expressionFactory .createValueExpression(elContext, "#{var.fname}", Object.class), null, SortOrder.ASCENDING), new SortField(null, new Comparator<User>() { - @Override public int compare(User o1, User o2) { return o1.getLname().compareTo(o2.getLname()); } @@ -177,7 +175,6 @@ public void testWalk() { final List<Object> rowKeys = new ArrayList<Object>(); DataVisitor visitor = new DataVisitor() { - @Override public DataVisitResult process(FacesContext context, Object rowKey, Object argument) { arrangeableModel.setRowKey(rowKey); if (arrangeableModel.isRowAvailable()) { @@ -203,7 +200,6 @@ public void testDataModelListener() { Assert.assertEquals(0, extendedDataModel.getDataModelListeners().length); DataModelListener listener = new DataModelListener() { - @Override public void rowSelected(DataModelEvent event) { } Modified: root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/UIExtendedDataTable.java =================================================================== --- root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/UIExtendedDataTable.java 2010-05-13 20:53:52 UTC (rev 17040) +++ root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/UIExtendedDataTable.java 2010-05-13 21:47:44 UTC (rev 17041) @@ -77,7 +77,6 @@ this.delegateCallback = delegateCallback; } - @Override public VisitResult visit(VisitContext visitContext, UIComponent target) { if (UIExtendedDataTable.this.equals(target)) { FacesContext context = visitContext.getFacesContext(); @@ -117,7 +116,6 @@ clientFirst, clientRows } - @Override public String resolveClientId(FacesContext facesContext, UIComponent contextComponent, String metaComponentId) { if (SUPPORTED_META_COMPONENTS.contains(metaComponentId)) { Object oldRowKey = getRowKey(); Modified: root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java =================================================================== --- root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-05-13 20:53:52 UTC (rev 17040) +++ root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-05-13 21:47:44 UTC (rev 17041) @@ -193,6 +193,7 @@ if (table.isColumnFacetPresent(facetName)) { encodeColumnFacetsProlog(state); for (state.startIterate(); state.hasNextPart();) { + //TODO nick - review this part of code state.nextPart(); encodeColumnFacetsPart(state); } @@ -478,7 +479,6 @@ return UIExtendedDataTable.class; } - @Override public void encodeMetaComponent(FacesContext context, UIComponent component) throws IOException { String metaComponentId = (String) context.getAttributes().get(ExtendedVisitContext.META_COMPONENT_ID); @@ -518,7 +518,6 @@ char partNameFirstChar = state.nextPart().getName().toString().charAt(0); final List<String> ids = new LinkedList<String>(); table.walk(context, new DataVisitor() { - @Override public DataVisitResult process(FacesContext context, Object rowKey, Object argument) { UIDataTableBase dataTable = state.getRow(); dataTable.setRowKey(context, rowKey); @@ -528,7 +527,6 @@ } }, removeRange, null); table.walk(context, new DataVisitor() { - @Override public DataVisitResult process(FacesContext context, Object rowKey, Object argument) { UIDataTableBase dataTable = state.getRow(); dataTable.setRowKey(context, rowKey); Modified: root/ui-sandbox/tables/trunk/ui/src/test/java/org/richfaces/component/UIColumnTest.java =================================================================== --- root/ui-sandbox/tables/trunk/ui/src/test/java/org/richfaces/component/UIColumnTest.java 2010-05-13 20:53:52 UTC (rev 17040) +++ root/ui-sandbox/tables/trunk/ui/src/test/java/org/richfaces/component/UIColumnTest.java 2010-05-13 21:47:44 UTC (rev 17041) @@ -87,7 +87,6 @@ public final void testFilter() { Assert.assertNull(column.getFilter()); Filter<?> filter = new Filter<Object>() { - @Override public boolean accept(Object t) { return false; } @@ -118,7 +117,6 @@ public final void testComparator() { Assert.assertNull(column.getComparator()); Comparator<?> comparator = new Comparator<Object>() { - @Override public int compare(Object o1, Object o2) { return 0; } @@ -138,7 +136,6 @@ expect(expression.isLiteralText()).andStubReturn(false); environment.replay(); Filter<?> filter = new Filter<Object>() { - @Override public boolean accept(Object t) { return false; } @@ -163,7 +160,6 @@ expect(expression.isLiteralText()).andStubReturn(false); environment.replay(); Comparator<?> comparator = new Comparator<Object>() { - @Override public int compare(Object o1, Object o2) { return 0; } Modified: root/ui-sandbox/tables/trunk/ui/src/test/java/org/richfaces/component/UIDataTableBaseTest.java =================================================================== --- root/ui-sandbox/tables/trunk/ui/src/test/java/org/richfaces/component/UIDataTableBaseTest.java 2010-05-13 20:53:52 UTC (rev 17040) +++ root/ui-sandbox/tables/trunk/ui/src/test/java/org/richfaces/component/UIDataTableBaseTest.java 2010-05-13 21:47:44 UTC (rev 17041) @@ -102,7 +102,6 @@ public void setWrappedData(Object data) { } - @Override public void arrange(FacesContext context, ArrangeableState state) { this.state = state; } Modified: root/ui-sandbox/tables/trunk/ui/src/test/java/org/richfaces/component/UIExtendedDataTableTest.java =================================================================== --- root/ui-sandbox/tables/trunk/ui/src/test/java/org/richfaces/component/UIExtendedDataTableTest.java 2010-05-13 20:53:52 UTC (rev 17040) +++ root/ui-sandbox/tables/trunk/ui/src/test/java/org/richfaces/component/UIExtendedDataTableTest.java 2010-05-13 21:47:44 UTC (rev 17041) @@ -95,7 +95,6 @@ public final void testWalkFacesContextDataVisitorRangeObject() { final StringBuilder builder = new StringBuilder(5); table.walk(facesContext, new DataVisitor() { - @Override public DataVisitResult process(FacesContext context, Object rowKey, Object argument) { table.setRowKey(rowKey); builder.append(table.getRowData());