You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2008/09/03 00:37:08 UTC
svn commit: r691410 [1/5] - in
/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src:
main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/
test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/
Author: matzew
Date: Tue Sep 2 15:37:07 2008
New Revision: 691410
URL: http://svn.apache.org/viewvc?rev=691410&view=rev
Log:
TRINIDAD-1204 - SELECTRANGECHOICEBAR SELECTION APPENDS PREVIOUS SELECTION
golden test-files reflect the rendering change.
thanks to Tadashi Enomori for his patch
Modified:
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectRangeChoiceBarRenderer.java
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/columnGroup-minimalPPC-golden.xml
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/editableTable-minimalPPC-golden.xml
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectRangeChoiceBar-minimalPPC-golden.xml
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectRangeChoiceBarBig-minimalPPC-golden.xml
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalPPC-golden.xml
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/tableSelectMany-minimalPPC-golden.xml
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/tableSelectOne-minimalPPC-golden.xml
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/treeTable-minimalPPC-golden.xml
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectRangeChoiceBarRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectRangeChoiceBarRenderer.java?rev=691410&r1=691409&r2=691410&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectRangeChoiceBarRenderer.java (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectRangeChoiceBarRenderer.java Tue Sep 2 15:37:07 2008
@@ -6,9 +6,9 @@
* 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
@@ -35,12 +35,13 @@
import org.apache.myfaces.trinidad.component.UIXSelectItem;
import org.apache.myfaces.trinidad.component.UIXSelectRange;
import org.apache.myfaces.trinidad.component.core.data.CoreSelectRangeChoiceBar;
-import org.apache.myfaces.trinidad.context.RequestContext;
-import org.apache.myfaces.trinidad.event.RangeChangeEvent;
-import org.apache.myfaces.trinidad.logging.TrinidadLogger;
+import org.apache.myfaces.trinidad.context.Agent;
import org.apache.myfaces.trinidad.context.FormData;
import org.apache.myfaces.trinidad.context.PartialPageContext;
import org.apache.myfaces.trinidad.context.RenderingContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
+import org.apache.myfaces.trinidad.event.RangeChangeEvent;
+import org.apache.myfaces.trinidad.logging.TrinidadLogger;
import org.apache.myfaces.trinidad.skin.Icon;
import org.apache.myfaces.trinidad.util.IntegerUtils;
import org.apache.myfaces.trinidadinternal.util.Range;
@@ -72,9 +73,9 @@
@Override
public void decode(FacesContext context, UIComponent component)
{
- Map<String, String> parameters =
+ Map<String, String> parameters =
context.getExternalContext().getRequestParameterMap();
-
+
Object event = parameters.get(XhtmlConstants.EVENT_PARAM);
// get the goto event parameter values and queue a RangeChangeEvent.
@@ -456,11 +457,24 @@
// render the subIDs. So we need to keep track of this.
boolean renderedId = false;
+ // If the request is from a desktop browser we don't need to wrap up
+ // with a div tag
+ boolean isDesktop = false;
+
// if we need to render standalone, create a table and table row...
if (renderAsTable)
{
+ isDesktop = (arc.getAgent().getType().equals(Agent.TYPE_DESKTOP));
+ // Few mobile browsers doesn't support PPR for Table element
+ // so lets wrap it up with a div tag
+ if(!isDesktop )
+ {
+ writer.startElement("div", component);
+ writer.writeAttribute("id", id, "id");
+ }
writer.startElement("table", component);
OutputUtils.renderLayoutTableAttributes(context, arc, "0", null);
+
// =-=AEW Where do these attrs get written out when
// we're inside a PanelPageButton?
renderAllAttributes(context, arc, bean);
@@ -469,7 +483,10 @@
// to make sure that the ID is rendered if the NavBar is being
// used to navigate a TableBean, since we explicitly target
// TableBean NavBars when using PPR to re-render TableBeans...
- writer.writeAttribute("id", id, "id");
+ if(isDesktop )
+ {
+ writer.writeAttribute("id", id, "id");
+ }
renderedId = true;
writer.startElement("tr", null);
@@ -569,6 +586,12 @@
writer.endElement("tr");
writer.endElement("table");
}
+
+ if(renderAsTable && !isDesktop )
+ {
+ writer.endElement("div");
+ }
+
}
// Make sure we always restore the row index correctly
finally
@@ -633,7 +656,7 @@
}
else
{
- List<SelectItem> items =
+ List<SelectItem> items =
new ArrayList<SelectItem>((int) _MAX_VISIBLE_OPTIONS);
int selectedIndex = _getItems(context, arc, component, items,
@@ -1156,7 +1179,7 @@
{
Map<String, Object> requestMap =
context.getExternalContext().getRequestMap();
-
+
if (old == null)
requestMap.remove(var);
else
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/columnGroup-minimalPPC-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/columnGroup-minimalPPC-golden.xml?rev=691410&r1=691409&r2=691410&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/columnGroup-minimalPPC-golden.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/columnGroup-minimalPPC-golden.xml Tue Sep 2 15:37:07 2008
@@ -25,87 +25,91 @@
valign="middle"
>
- <table
- border="0"
- cellpadding="0"
- cellspacing="0"
+ <div
id="mainId-nb"
- summary=""
>
- <tr
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
>
- <td
- nowrap="nowrap"
- valign="middle"
+ <tr
>
- <span
- class="OraNavBarInactiveLink"
- >
- Previous
- </span>
- </td>
- <td
- >
-  
- </td>
- <td
- nowrap="nowrap"
- valign="middle"
- >
-
- <select
- class="AFFieldText"
- id="mainId-nb__xc_c"
- onchange="_navChoiceSubmit(this, 'formId','goto','mainId',1)"
- onfocus="this._lastValue = this.selectedIndex"
- title="Select record set"
+ <td
+ nowrap="nowrap"
+ valign="middle"
>
- <option
- value="all"
+ <span
+ class="OraNavBarInactiveLink"
>
- Show All 6
- </option>
- <option
- selected="selected"
- value="1"
+ Previous
+ </span>
+ </td>
+ <td
+ >
+  
+ </td>
+ <td
+ nowrap="nowrap"
+ valign="middle"
+ >
+
+ <select
+ class="AFFieldText"
+ id="mainId-nb__xc_c"
+ onchange="_navChoiceSubmit(this, 'formId','goto','mainId',1)"
+ onfocus="this._lastValue = this.selectedIndex"
+ title="Select record set"
>
- 1-5 of 6
- </option>
- <option
- value="6"
+
+ <option
+ value="all"
+ >
+ Show All 6
+ </option>
+ <option
+ selected="selected"
+ value="1"
+ >
+ 1-5 of 6
+ </option>
+ <option
+ value="6"
+ >
+ 6-6 of 6
+ </option>
+ </select>
+ <script
+ type="text/javascript"
>
- 6-6 of 6
- </option>
- </select>
- <script
- type="text/javascript"
+ _setSelectIndexById("mainId-nb__xc_c",1)
+ </script>
+ </td>
+ <td
>
- _setSelectIndexById("mainId-nb__xc_c",1)
- </script>
- </td>
- <td
- >
-  
- </td>
- <td
- nowrap="nowrap"
- valign="middle"
- >
-
- <a
- class="OraNavBarActiveLink"
- onclick="_navSubmit('formId', 'goto', 'mainId',1,'6');return false"
- href="uri-attr:#"
+  
+ </td>
+ <td
+ nowrap="nowrap"
+ valign="middle"
>
- Next 1
- </a>
- </td>
- </tr>
- </table>
+
+ <a
+ class="OraNavBarActiveLink"
+ onclick="_navSubmit('formId', 'goto', 'mainId',1,'6');return false"
+ href="uri-attr:#"
+ >
+ Next 1
+ </a>
+ </td>
+ </tr>
+ </table>
+ </div>
</div>
</div>
</td>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/editableTable-minimalPPC-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/editableTable-minimalPPC-golden.xml?rev=691410&r1=691409&r2=691410&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/editableTable-minimalPPC-golden.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/editableTable-minimalPPC-golden.xml Tue Sep 2 15:37:07 2008
@@ -25,87 +25,91 @@
valign="middle"
>
- <table
- border="0"
- cellpadding="0"
- cellspacing="0"
+ <div
id="mainId-nb"
- summary=""
>
- <tr
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
>
- <td
- nowrap="nowrap"
- valign="middle"
+ <tr
>
- <span
- class="OraNavBarInactiveLink"
- >
- Previous
- </span>
- </td>
- <td
- >
-  
- </td>
- <td
- nowrap="nowrap"
- valign="middle"
- >
-
- <select
- class="AFFieldText"
- id="mainId-nb__xc_c"
- onchange="_navChoiceSubmit(this, 'formId','goto','mainId',1)"
- onfocus="this._lastValue = this.selectedIndex"
- title="Select record set"
+ <td
+ nowrap="nowrap"
+ valign="middle"
>
- <option
- value="all"
+ <span
+ class="OraNavBarInactiveLink"
>
- Show All 6
- </option>
- <option
- selected="selected"
- value="1"
+ Previous
+ </span>
+ </td>
+ <td
+ >
+  
+ </td>
+ <td
+ nowrap="nowrap"
+ valign="middle"
+ >
+
+ <select
+ class="AFFieldText"
+ id="mainId-nb__xc_c"
+ onchange="_navChoiceSubmit(this, 'formId','goto','mainId',1)"
+ onfocus="this._lastValue = this.selectedIndex"
+ title="Select record set"
>
- 1-5 of 6
- </option>
- <option
- value="6"
+
+ <option
+ value="all"
+ >
+ Show All 6
+ </option>
+ <option
+ selected="selected"
+ value="1"
+ >
+ 1-5 of 6
+ </option>
+ <option
+ value="6"
+ >
+ 6-6 of 6
+ </option>
+ </select>
+ <script
+ type="text/javascript"
>
- 6-6 of 6
- </option>
- </select>
- <script
- type="text/javascript"
+ _setSelectIndexById("mainId-nb__xc_c",1)
+ </script>
+ </td>
+ <td
>
- _setSelectIndexById("mainId-nb__xc_c",1)
- </script>
- </td>
- <td
- >
-  
- </td>
- <td
- nowrap="nowrap"
- valign="middle"
- >
-
- <a
- class="OraNavBarActiveLink"
- onclick="_navSubmit('formId', 'goto', 'mainId',1,'6');return false"
- href="uri-attr:#"
+  
+ </td>
+ <td
+ nowrap="nowrap"
+ valign="middle"
>
- Next 1
- </a>
- </td>
- </tr>
- </table>
+
+ <a
+ class="OraNavBarActiveLink"
+ onclick="_navSubmit('formId', 'goto', 'mainId',1,'6');return false"
+ href="uri-attr:#"
+ >
+ Next 1
+ </a>
+ </td>
+ </tr>
+ </table>
+ </div>
</div>
</div>
</td>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectRangeChoiceBar-minimalPPC-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectRangeChoiceBar-minimalPPC-golden.xml?rev=691410&r1=691409&r2=691410&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectRangeChoiceBar-minimalPPC-golden.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectRangeChoiceBar-minimalPPC-golden.xml Tue Sep 2 15:37:07 2008
@@ -1,58 +1,62 @@
<results>
- <table
- border="0"
- cellpadding="0"
- cellspacing="0"
+ <div
id="mainId"
- summary=""
>
- <tr
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
>
- <td
- nowrap="nowrap"
- valign="middle"
+ <tr
>
- <span
- class="OraNavBarInactiveLink"
+ <td
+ nowrap="nowrap"
+ valign="middle"
>
- Previous
- </span>
- </td>
- <td
- >
-  
- </td>
- <td
- nowrap="nowrap"
- valign="middle"
- >
-
- <span
- class="AFFieldText"
+
+ <span
+ class="OraNavBarInactiveLink"
+ >
+ Previous
+ </span>
+ </td>
+ <td
+ >
+  
+ </td>
+ <td
+ nowrap="nowrap"
+ valign="middle"
>
- 1-4 of 4
- </span>
- </td>
- <td
- >
-  
- </td>
- <td
- nowrap="nowrap"
- valign="middle"
- >
-
- <span
- class="OraNavBarInactiveLink"
+
+ <span
+ class="AFFieldText"
+ >
+ 1-4 of 4
+ </span>
+ </td>
+ <td
+ >
+  
+ </td>
+ <td
+ nowrap="nowrap"
+ valign="middle"
>
- Next
- </span>
- </td>
- </tr>
- </table>
+
+ <span
+ class="OraNavBarInactiveLink"
+ >
+ Next
+ </span>
+ </td>
+ </tr>
+ </table>
+ </div>
<!--AttributeTest[first,1]-->
<script
@@ -65,249 +69,265 @@
>
function _navChoiceSubmit(choice, formName, event, id, vld){if (!_navSubmit(formName, event, id, vld, choice.options[choice.selectedIndex].value)){choice.selectedIndex = choice._lastValue;}}
</script>
- <table
- border="0"
- cellpadding="0"
- cellspacing="0"
+ <div
id="mainId"
- summary=""
>
- <tr
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
>
- <td
- nowrap="nowrap"
- valign="middle"
- >
-
- <a
- class="OraNavBarActiveLink"
- onclick="_navSubmit('formId', 'goto', 'mainId',1,'1');return false"
- href="uri-attr:#"
- >
- Previous 1
- </a>
- </td>
- <td
- >
-  
- </td>
- <td
- nowrap="nowrap"
- valign="middle"
+ <tr
>
- <select
- class="AFFieldText"
- id="mainId__xc_c"
- onchange="_navChoiceSubmit(this, 'formId','goto','mainId',1)"
- onfocus="this._lastValue = this.selectedIndex"
- title="Select record set"
- >
-
- <option
- value="all"
- >
- Show All 4
- </option>
- <option
- value="1"
- >
- 1-1 of 4
- </option>
- <option
- selected="selected"
- value="2"
- >
- 2-4 of 4
- </option>
- </select>
- <script
- type="text/javascript"
- >
- _setSelectIndexById("mainId__xc_c",2)
- </script>
- </td>
- <td
- >
-  
- </td>
- <td
- nowrap="nowrap"
- valign="middle"
- >
-
- <span
- class="OraNavBarInactiveLink"
+ <td
+ nowrap="nowrap"
+ valign="middle"
+ >
+
+ <a
+ class="OraNavBarActiveLink"
+ onclick="_navSubmit('formId', 'goto', 'mainId',1,'1');return false"
+ href="uri-attr:#"
+ >
+ Previous 1
+ </a>
+ </td>
+ <td
+ >
+  
+ </td>
+ <td
+ nowrap="nowrap"
+ valign="middle"
>
- Next
- </span>
- </td>
- </tr>
- </table>
+
+ <select
+ class="AFFieldText"
+ id="mainId__xc_c"
+ onchange="_navChoiceSubmit(this, 'formId','goto','mainId',1)"
+ onfocus="this._lastValue = this.selectedIndex"
+ title="Select record set"
+ >
+
+ <option
+ value="all"
+ >
+ Show All 4
+ </option>
+ <option
+ value="1"
+ >
+ 1-1 of 4
+ </option>
+ <option
+ selected="selected"
+ value="2"
+ >
+ 2-4 of 4
+ </option>
+ </select>
+ <script
+ type="text/javascript"
+ >
+ _setSelectIndexById("mainId__xc_c",2)
+ </script>
+ </td>
+ <td
+ >
+  
+ </td>
+ <td
+ nowrap="nowrap"
+ valign="middle"
+ >
+
+ <span
+ class="OraNavBarInactiveLink"
+ >
+ Next
+ </span>
+ </td>
+ </tr>
+ </table>
+ </div>
<!--AttributeTest[rows,0]-->
- <table
- border="0"
- cellpadding="0"
- cellspacing="0"
+ <div
id="mainId"
- summary=""
>
- <tr
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
>
- <td
- nowrap="nowrap"
- valign="middle"
+ <tr
>
- <span
- class="OraNavBarInactiveLink"
+ <td
+ nowrap="nowrap"
+ valign="middle"
>
- Previous
- </span>
- </td>
- <td
- >
-  
- </td>
- <td
- nowrap="nowrap"
- valign="middle"
- >
-  
- </td>
- <td
- >
-  
- </td>
- <td
- nowrap="nowrap"
- valign="middle"
- >
-
- <span
- class="OraNavBarInactiveLink"
+
+ <span
+ class="OraNavBarInactiveLink"
+ >
+ Previous
+ </span>
+ </td>
+ <td
+ >
+  
+ </td>
+ <td
+ nowrap="nowrap"
+ valign="middle"
+ >
+  
+ </td>
+ <td
+ >
+  
+ </td>
+ <td
+ nowrap="nowrap"
+ valign="middle"
>
- Next
- </span>
- </td>
- </tr>
- </table>
+
+ <span
+ class="OraNavBarInactiveLink"
+ >
+ Next
+ </span>
+ </td>
+ </tr>
+ </table>
+ </div>
<!--AttributeTest[id,null]-->
- <table
- border="0"
- cellpadding="0"
- cellspacing="0"
+ <div
id="test-id"
- summary=""
>
- <tr
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
>
- <td
- nowrap="nowrap"
- valign="middle"
+ <tr
>
- <span
- class="OraNavBarInactiveLink"
+ <td
+ nowrap="nowrap"
+ valign="middle"
>
- Previous
- </span>
- </td>
- <td
- >
-  
- </td>
- <td
- nowrap="nowrap"
- valign="middle"
- >
-
- <span
- class="AFFieldText"
+
+ <span
+ class="OraNavBarInactiveLink"
+ >
+ Previous
+ </span>
+ </td>
+ <td
+ >
+  
+ </td>
+ <td
+ nowrap="nowrap"
+ valign="middle"
>
- 1-4 of 4
- </span>
- </td>
- <td
- >
-  
- </td>
- <td
- nowrap="nowrap"
- valign="middle"
- >
-
- <span
- class="OraNavBarInactiveLink"
+
+ <span
+ class="AFFieldText"
+ >
+ 1-4 of 4
+ </span>
+ </td>
+ <td
+ >
+  
+ </td>
+ <td
+ nowrap="nowrap"
+ valign="middle"
>
- Next
- </span>
- </td>
- </tr>
- </table>
+
+ <span
+ class="OraNavBarInactiveLink"
+ >
+ Next
+ </span>
+ </td>
+ </tr>
+ </table>
+ </div>
<!--AttributeTest[shortDesc,null]-->
- <table
- border="0"
- cellpadding="0"
- cellspacing="0"
+ <div
id="mainId"
- summary=""
- title="test-shortDesc"
>
- <tr
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
+ title="test-shortDesc"
>
- <td
- nowrap="nowrap"
- valign="middle"
+ <tr
>
- <span
- class="OraNavBarInactiveLink"
+ <td
+ nowrap="nowrap"
+ valign="middle"
>
- Previous
- </span>
- </td>
- <td
- >
-  
- </td>
- <td
- nowrap="nowrap"
- valign="middle"
- >
-
- <span
- class="AFFieldText"
+
+ <span
+ class="OraNavBarInactiveLink"
+ >
+ Previous
+ </span>
+ </td>
+ <td
+ >
+  
+ </td>
+ <td
+ nowrap="nowrap"
+ valign="middle"
>
- 1-4 of 4
- </span>
- </td>
- <td
- >
-  
- </td>
- <td
- nowrap="nowrap"
- valign="middle"
- >
-
- <span
- class="OraNavBarInactiveLink"
+
+ <span
+ class="AFFieldText"
+ >
+ 1-4 of 4
+ </span>
+ </td>
+ <td
+ >
+  
+ </td>
+ <td
+ nowrap="nowrap"
+ valign="middle"
>
- Next
- </span>
- </td>
- </tr>
- </table>
+
+ <span
+ class="OraNavBarInactiveLink"
+ >
+ Next
+ </span>
+ </td>
+ </tr>
+ </table>
+ </div>
</results>