Changeset 553 for geisa/persistence


Ignore:
Timestamp:
09/18/12 17:07:17 (12 years ago)
Author:
npipsl
Message:

transitions

Location:
geisa/persistence/implementation/com/ether/dao
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • geisa/persistence/implementation/com/ether/dao/IsotopeG03DAOImpl.java

    r542 r553  
    55import com.ether.PersistenceException; 
    66import org.hibernate.criterion.DetachedCriteria; 
     7import org.hibernate.criterion.Order; 
    78import org.hibernate.criterion.Projection; 
    89import org.hibernate.criterion.Projections; 
    … …  
    1112 
    1213import java.util.HashSet; 
     14import java.util.LinkedHashSet; 
    1315import java.util.List; 
    1416import java.util.Set; 
    … …  
    5658                .add( Restrictions.le( "wavenbMin", spectralRangeUpper ) ) 
    5759                .add( Restrictions.eq( "codeQuantLower",transitionLower ) ); 
    58             criteria.setProjection( Projections.distinct( Projections.property( "codeQuantUpper" ) )); 
     60        criteria.addOrder( Order.asc( "codeQuantUpper" ) ); 
     61        criteria.setProjection( Projections.distinct( Projections.property( "codeQuantUpper" ) )); 
     62 
    5963 
    6064        final List<String> transitions = selectAllByCriteria( String.class, criteria ); 
    61         return new HashSet<String>( transitions ); 
     65        return new LinkedHashSet<String>( transitions ); 
    6266    } 
    6367 
    … …  
    6771    { 
    6872 
    69           final DetachedCriteria criteria = DetachedCriteria.forClass( IsotopeG03.class ) 
     73        final DetachedCriteria criteria = DetachedCriteria.forClass( IsotopeG03.class ) 
    7074                .add( Restrictions.in( "chMoleIsot", isotopesSelectedNameList ) ) 
    7175                .add( Restrictions.ge( "wavenbMax", spectralRangeLower ) ) 
    7276                .add( Restrictions.le( "wavenbMin", spectralRangeUpper ) ) 
    7377                .add( Restrictions.eq( "codeQuantUpper",transitionUpper ) ); 
    74             criteria.setProjection( Projections.distinct( Projections.property( "codeQuantLower" ) )); 
     78        /*classer par ordre croissant*/ 
     79        criteria.addOrder( Order.asc("codeQuantLower") ); 
     80        /*enlever les doublons*/ 
     81        criteria.setProjection( Projections.distinct( Projections.property( "codeQuantLower" ) )); 
     82 
    7583 
    7684        final List<String> transitions = selectAllByCriteria( String.class, criteria ); 
    77         return new HashSet<String>( transitions ); 
     85        return new LinkedHashSet<String>( transitions ); 
    7886    } 
    7987 
    … …  
    102110 
    103111        if(isForUpper) 
    104             criteria.setProjection( Projections.distinct( Projections.property( "codeQuantUpper" ) )); 
     112            criteria.addOrder( Order.asc( "codeQuantUpper" ) ) 
     113                    .setProjection( Projections.distinct( Projections.property( "codeQuantUpper" ) ) ); 
    105114        else 
    106             criteria.setProjection( Projections.distinct( Projections.property( "codeQuantLower" ) )); 
     115            criteria.addOrder( Order.asc("codeQuantLower") ) 
     116                    .setProjection( Projections.distinct( Projections.property( "codeQuantLower" ) ) ); 
    107117 
    108118        final List<String> transitions = selectAllByCriteria( String.class, criteria ); 
    109         return new HashSet<String>( transitions ); 
     119        return new LinkedHashSet<String> ( transitions ); 
    110120    } 
    111121 

  • geisa/persistence/implementation/com/ether/dao/IsotopeG09DAOImpl.java

    r542 r553  
    55import com.ether.PersistenceException; 
    66import org.hibernate.criterion.DetachedCriteria; 
     7import org.hibernate.criterion.Order; 
    78import org.hibernate.criterion.Projections; 
    89import org.hibernate.criterion.Restrictions; 
    … …  
    1011 
    1112import java.util.HashSet; 
     13import java.util.LinkedHashSet; 
    1214import java.util.List; 
    1315import java.util.Set; 
    … …  
    3638                .add( Restrictions.le( "wavenbMin", spectralRangeUpper ) ) 
    3739                .add( Restrictions.eq( "codeQuantLower",transitionLower ) ); 
    38             criteria.setProjection( Projections.distinct( Projections.property( "codeQuantUpper" ) )); 
     40        criteria.addOrder( Order.asc( "codeQuantUpper" ) ); 
     41        criteria.setProjection( Projections.distinct( Projections.property( "codeQuantUpper" ) )); 
    3942 
    4043        final List<String> transitions = selectAllByCriteria( String.class, criteria ); 
    41         return new HashSet<String>( transitions ); 
     44        return new LinkedHashSet<String>( transitions ); 
    4245    } 
    4346 
    … …  
    5255                .add( Restrictions.le( "wavenbMin", spectralRangeUpper ) ) 
    5356                .add( Restrictions.eq( "codeQuantUpper",transitionUpper ) ); 
    54             criteria.setProjection( Projections.distinct( Projections.property( "codeQuantLower" ) )); 
     57        criteria.addOrder( Order.asc("codeQuantLower") ); 
     58        criteria.setProjection( Projections.distinct( Projections.property( "codeQuantLower" ) )); 
    5559 
    5660        final List<String> transitions = selectAllByCriteria( String.class, criteria ); 
    57         return new HashSet<String>( transitions ); 
     61        return new LinkedHashSet<String>( transitions ); 
    5862    } 
    5963 
    … …  
    8286 
    8387        if(isForUpper) 
    84             criteria.setProjection( Projections.distinct( Projections.property( "codeQuantUpper" ) )); 
     88            criteria.addOrder( Order.asc( "codeQuantUpper" ) ) 
     89                    .setProjection( Projections.distinct( Projections.property( "codeQuantUpper" ) ) ); 
    8590        else 
    86             criteria.setProjection( Projections.distinct( Projections.property( "codeQuantLower" ) )); 
     91            criteria.addOrder( Order.asc("codeQuantLower") ) 
     92                    .setProjection( Projections.distinct( Projections.property( "codeQuantLower" ) ) ); 
    8793 
    8894        final List<String> transitions = selectAllByCriteria( String.class, criteria ); 
    89         return new HashSet<String>( transitions ); 
     95        return new LinkedHashSet<String> ( transitions ); 
    9096    } 
    9197 

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

    r542 r553  
    66import com.ether.PersistenceException; 
    77import org.hibernate.criterion.DetachedCriteria; 
     8import org.hibernate.criterion.Order; 
    89import org.hibernate.criterion.Projections; 
    910import org.hibernate.criterion.Restrictions; 
    … …  
    1112 
    1213import java.util.HashSet; 
     14import java.util.LinkedHashSet; 
    1315import java.util.List; 
    1416import java.util.Set; 
    … …  
    3840                .add( Restrictions.le( "wavenbMin", spectralRangeUpper ) ) 
    3941                .add( Restrictions.eq( "codeQuantLower",transitionLower ) ); 
    40             criteria.setProjection( Projections.distinct( Projections.property( "codeQuantUpper" ) )); 
     42        criteria.addOrder( Order.asc( "codeQuantUpper" ) ); 
     43        criteria.setProjection( Projections.distinct( Projections.property( "codeQuantUpper" ) )); 
    4144 
    4245        final List<String> transitions = selectAllByCriteria( String.class, criteria ); 
    43         return new HashSet<String>( transitions ); 
     46        return new LinkedHashSet<String>( transitions ); 
    4447    } 
    4548 
    … …  
    5457                .add( Restrictions.le( "wavenbMin", spectralRangeUpper ) ) 
    5558                .add( Restrictions.eq( "codeQuantUpper",transitionUpper ) ); 
    56             criteria.setProjection( Projections.distinct( Projections.property( "codeQuantLower" ) )); 
     59        criteria.addOrder( Order.asc("codeQuantLower") ); 
     60        criteria.setProjection( Projections.distinct( Projections.property( "codeQuantLower" ) )); 
    5761 
    5862        final List<String> transitions = selectAllByCriteria( String.class, criteria ); 
    59         return new HashSet<String>( transitions ); 
     63        return new LinkedHashSet<String>( transitions ); 
    6064    } 
    6165 
    … …  
    8589 
    8690        if(isForUpper) 
    87             criteria.setProjection( Projections.distinct( Projections.property( "codeQuantUpper" ) )); 
     91            criteria.addOrder( Order.asc( "codeQuantUpper" ) ) 
     92                    .setProjection( Projections.distinct( Projections.property( "codeQuantUpper" ) ) ); 
    8893        else 
    89             criteria.setProjection( Projections.distinct( Projections.property( "codeQuantLower" ) )); 
     94            criteria.addOrder( Order.asc("codeQuantLower") ) 
     95                    .setProjection( Projections.distinct( Projections.property( "codeQuantLower" ) ) ); 
    9096 
    9197        final List<String> transitions = selectAllByCriteria( String.class, criteria ); 
    92         return new HashSet<String>( transitions ); 
     98        return new LinkedHashSet<String> ( transitions ); 
    9399    } 
    94100 

  • geisa/persistence/implementation/com/ether/dao/IsotopeIasiG09DAOImpl.java

    r542 r553  
    66import com.ether.PersistenceException; 
    77import org.hibernate.criterion.DetachedCriteria; 
     8import org.hibernate.criterion.Order; 
    89import org.hibernate.criterion.Projections; 
    910import org.hibernate.criterion.Restrictions; 
    … …  
    1112 
    1213import java.util.HashSet; 
     14import java.util.LinkedHashSet; 
    1315import java.util.List; 
    1416import java.util.Set; 
    … …  
    3638                .add( Restrictions.le( "wavenbMin", spectralRangeUpper ) ) 
    3739                .add( Restrictions.eq( "codeQuantLower",transitionLower ) ); 
    38             criteria.setProjection( Projections.distinct( Projections.property( "codeQuantUpper" ) )); 
     40        criteria.addOrder( Order.asc( "codeQuantUpper" ) ); 
     41        criteria.setProjection( Projections.distinct( Projections.property( "codeQuantUpper" ) )); 
    3942 
    4043        final List<String> transitions = selectAllByCriteria( String.class, criteria ); 
    41         return new HashSet<String>( transitions ); 
     44        return new LinkedHashSet<String>( transitions ); 
    4245    } 
    4346 
    … …  
    5255                .add( Restrictions.le( "wavenbMin", spectralRangeUpper ) ) 
    5356                .add( Restrictions.eq( "codeQuantUpper",transitionUpper ) ); 
    54             criteria.setProjection( Projections.distinct( Projections.property( "codeQuantLower" ) )); 
     57        criteria.addOrder( Order.asc("codeQuantLower") ); 
     58        criteria.setProjection( Projections.distinct( Projections.property( "codeQuantLower" ) )); 
    5559 
    5660        final List<String> transitions = selectAllByCriteria( String.class, criteria ); 
    57         return new HashSet<String>( transitions ); 
     61        return new LinkedHashSet<String>( transitions ); 
    5862    } 
    5963 
    … …  
    8286 
    8387        if(isForUpper) 
    84             criteria.setProjection( Projections.distinct( Projections.property( "codeQuantUpper" ) )); 
     88            criteria.addOrder( Order.asc( "codeQuantUpper" ) ) 
     89                    .setProjection( Projections.distinct( Projections.property( "codeQuantUpper" ) ) ); 
    8590        else 
    86             criteria.setProjection( Projections.distinct( Projections.property( "codeQuantLower" ) )); 
     91            criteria.addOrder( Order.asc("codeQuantLower") ) 
     92                    .setProjection( Projections.distinct( Projections.property( "codeQuantLower" ) ) ); 
    8793 
    8894        final List<String> transitions = selectAllByCriteria( String.class, criteria ); 
    89         return new HashSet<String>( transitions ); 
     95        return new LinkedHashSet<String> ( transitions ); 
    9096    } 
    9197 
Note: See TracChangeset for help on using the changeset viewer.