litesoft

URLs

Explore

Commits

Diff Revisions 150 vs 151 for /trunk/Java/core/Server/src/org/litesoft/orsup/base/POOrderBy.java

		@@ -47,10 +47,8 @@
47	47
48	48		private static boolean isAcceptable( MetaDataForPO pMD, OrderBy pOrderByClause )
49	49		{
50		-	AttributeAccessorSCD scd =
51		-	pMD.getAccessorSCDoptional( pOrderByClause.getColumnDefinition().getName() );
52		-	if ( (scd != null) && scd.isPersisted() && SupplimentedSCD.Form.Local.equals( scd.getForm() ) &&
53		-	scd.isColumnTypeComparable() )
	50	+	AttributeAccessorSCD scd = pMD.getAccessorSCDoptional( pOrderByClause.getColumnDefinition().getName() );
	51	+	if ( (scd != null) && scd.isPersisted() && SupplimentedSCD.Form.Local.equals( scd.getForm() ) && scd.isColumnTypeComparable() )
54	52		{
55	53		OrderBy zSubOrderBy = pOrderByClause.getSubOrderBy();
56	54		return (zSubOrderBy == null) \|\| isAcceptable( pMD, zSubOrderBy );
		@@ -64,10 +62,8 @@
64	62		{
65	63		return null;
66	64		}
67		-	AttributeAccessorSCD scd =
68		-	pMD.getAccessorSCDrequired( pOrderByClause.getColumnDefinition().getName() );
69		-	return new MyComparator( pMD.getPOregistrationName(), scd, pOrderByClause.isDescending(),
70		-	createComparator( pMD, pOrderByClause.getSubOrderBy() ) );
	65	+	AttributeAccessorSCD scd = pMD.getAccessorSCDrequired( pOrderByClause.getColumnDefinition().getName() );
	66	+	return new MyComparator( pMD.getPOregistrationName(), scd, pOrderByClause.isDescending(), createComparator( pMD, pOrderByClause.getSubOrderBy() ) );
71	67		}
72	68
73	69		private static class MyComparator implements Comparator<PersistentObject<?>>
		@@ -77,8 +73,7 @@
77	73		private boolean mDecending;
78	74		private MyComparator mSubComparator;
79	75
80		-	public MyComparator( String pPORegisteredName, AttributeAccessorSCD pSCD, boolean pDecending,
81		-	MyComparator pSubComparator )
	76	+	public MyComparator( String pPORegisteredName, AttributeAccessorSCD pSCD, boolean pDecending, MyComparator pSubComparator )
82	77		{
83	78		mPORegisteredName = pPORegisteredName;
84	79		mSCD = pSCD;

View View this file contents

History View the full history

Feeds

Commits for /trunk/Java/core/Server/src/org/litesoft/orsup/base/POOrderBy.java