Changeset 553 for geisa/persistence/implementation/com/ether/dao/IsotopeIasiG03DAOImpl.java

Timestamp:

09/18/12 17:07:17 (12 years ago)

Author:

npipsl

Message:

transitions

File:

• geisa/persistence/implementation/com/ether/dao/IsotopeIasiG03DAOImpl.java (modified) (5 diffs)

geisa/persistence/implementation/com/ether/dao/IsotopeIasiG03DAOImpl.java

@@ -6 +6 @@
 import com.ether.PersistenceException;
 import org.hibernate.criterion.DetachedCriteria;
+import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Projections;
 import org.hibernate.criterion.Restrictions;
@@ -11 +12 @@
 
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
@@ -38 +40 @@
                 .add( Restrictions.le( "wavenbMin", spectralRangeUpper ) )
                 .add( Restrictions.eq( "codeQuantLower",transitionLower ) );
-            criteria.setProjection( Projections.distinct( Projections.property( "codeQuantUpper" ) ));
+        criteria.addOrder( Order.asc( "codeQuantUpper" ) );
+        criteria.setProjection( Projections.distinct( Projections.property( "codeQuantUpper" ) ));
 
         final List<String> transitions = selectAllByCriteria( String.class, criteria );
-        return new HashSet<String>( transitions );
+        return new LinkedHashSet<String>( transitions );
     }
 
@@ -54 +57 @@
                 .add( Restrictions.le( "wavenbMin", spectralRangeUpper ) )
                 .add( Restrictions.eq( "codeQuantUpper",transitionUpper ) );
-            criteria.setProjection( Projections.distinct( Projections.property( "codeQuantLower" ) ));
+        criteria.addOrder( Order.asc("codeQuantLower") );
+        criteria.setProjection( Projections.distinct( Projections.property( "codeQuantLower" ) ));
 
         final List<String> transitions = selectAllByCriteria( String.class, criteria );
-        return new HashSet<String>( transitions );
+        return new LinkedHashSet<String>( transitions );
     }
 
@@ -85 +89 @@
 
         if(isForUpper)
-            criteria.setProjection( Projections.distinct( Projections.property( "codeQuantUpper" ) ));
+            criteria.addOrder( Order.asc( "codeQuantUpper" ) )
+                    .setProjection( Projections.distinct( Projections.property( "codeQuantUpper" ) ) );
         else
-            criteria.setProjection( Projections.distinct( Projections.property( "codeQuantLower" ) ));
+            criteria.addOrder( Order.asc("codeQuantLower") )
+                    .setProjection( Projections.distinct( Projections.property( "codeQuantLower" ) ) );
 
         final List<String> transitions = selectAllByCriteria( String.class, criteria );
-        return new HashSet<String>( transitions );
+        return new LinkedHashSet<String> ( transitions );
     }