Revision: 110
http://svn.sourceforge.net/pzfilereader/?rev=110&view=rev
Author: zepernick
Date: 2006-10-23 03:58:17 -0700 (Mon, 23 Oct 2006)
Log Message:
-----------
Keep the header and trailer in the same order when moving to the bottom
Modified Paths:
--------------
trunk/PZFileReader/src/main/java/net/sf/pzfilereader/ordering/OrderBy.java
Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/ordering/OrderBy.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/ordering/OrderBy.java 2006-10-20 12:14:30 UTC (rev 109)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/ordering/OrderBy.java 2006-10-23 10:58:17 UTC (rev 110)
@@ -19,6 +19,7 @@
import java.util.List;
import net.sf.pzfilereader.structure.Row;
+import net.sf.pzfilereader.util.PZConstants;
import net.sf.pzfilereader.util.ParserUtils;
/**
@@ -59,13 +60,18 @@
for (int i = 0; i < orderbys.size(); i++) {
final OrderColumn oc = (OrderColumn) orderbys.get(i);
-
// null indicates "detail" record which is what the parser assigns
// to <column> 's setup outside of <record> elements
+ final String mdkey0 = row0.getMdkey() == null ? PZConstants.DETAIL_ID : row0.getMdkey();
+ final String mdkey1 = row1.getMdkey() == null ? PZConstants.DETAIL_ID : row1.getMdkey();
+
// shift all non detail records to the bottom of the DataSet
- if (row0.getMdkey() != null && !row0.getMdkey().equals("detail")) {
+ if (!mdkey0.equals(PZConstants.DETAIL_ID) && !mdkey1.equals(PZConstants.DETAIL_ID)){
+ //keep headers / trailers in the same order at the bottom of the DataSet
+ return 0;
+ }else if (!mdkey0.equals(PZConstants.DETAIL_ID)) {
return 1;
- } else if (row1.getMdkey() != null && !row1.getMdkey().equals("detail")) {
+ } else if (!mdkey1.equals(PZConstants.DETAIL_ID)) {
return 0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
