Changeset 541 for geisa/persistence

Timestamp:

07/27/12 17:42:03 (12 years ago)

Author:

npipsl

Message:

Début raffraichissement menu transition quand on clique dessus

Location:

geisa/persistence

Files:

• implementation/com/ether/dao/IsotopeG03DAOImpl.java (modified) (1 diff)
• implementation/com/ether/dao/IsotopeG09DAOImpl.java (modified) (1 diff)
• implementation/com/ether/dao/IsotopeIasiG03DAOImpl.java (modified) (2 diffs)
• implementation/com/ether/dao/IsotopeIasiG09DAOImpl.java (modified) (1 diff)
• interface/com/ether/dao/IsotopeG03DAO.java (modified) (1 diff)
• interface/com/ether/dao/IsotopeG09DAO.java (modified) (1 diff)
• interface/com/ether/dao/IsotopeIasiG03DAO.java (modified) (1 diff)
• interface/com/ether/dao/IsotopeIasiG09DAO.java (modified) (1 diff)

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

@@ -47 +47 @@
 
     @NotNull
-    public List<IsotopeG03> getTransitionsByIsotopeG03NameByTransitionLower( final String isotopeName, final Float spectralRangeLower, final Float spectralRangeUpper , final String transitionLower)
+    public Set<String> getTransitionsUpperByTransitionLower( final List<String> isotopesSelectedNameList, final Float spectralRangeLower, final Float spectralRangeUpper , final String transitionLower)
             throws PersistenceException
     {
-        final DetachedCriteria criteria = DetachedCriteria.forClass( IsotopeG03.class );
-        criteria.add( Restrictions.eq( "chMoleIsot", isotopeName ) );
-        criteria.add( Restrictions.ge( "wavenbMax", spectralRangeLower) );
-        criteria.add( Restrictions.le( "wavenbMin", spectralRangeUpper) );
-        criteria.add( Restrictions.eq( "codeQuantLower",transitionLower ) );
-        return selectAllByCriteria( IsotopeG03.class, criteria );
+
+          final DetachedCriteria criteria = DetachedCriteria.forClass( IsotopeG03.class )
+                .add( Restrictions.in( "chMoleIsot", isotopesSelectedNameList ) )
+                .add( Restrictions.ge( "wavenbMax", spectralRangeLower ) )
+                .add( Restrictions.le( "wavenbMin", spectralRangeUpper ) )
+                .add( Restrictions.eq( "codeQuantLower",transitionLower ) );
+            criteria.setProjection( Projections.distinct( Projections.property( "codeQuantUpper" ) ));
+
+        final List<String> transitions = selectAllByCriteria( String.class, criteria );
+        return new HashSet<String>( transitions );
     }
 

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

@@ -26 +26 @@
     }
 
+     @NotNull
+    public Set<String> getTransitionsUpperByTransitionLower( final List<String> isotopesSelectedNameList, final Float spectralRangeLower, final Float spectralRangeUpper , final String transitionLower)
+            throws PersistenceException
+    {
+
+          final DetachedCriteria criteria = DetachedCriteria.forClass( IsotopeG09.class )
+                .add( Restrictions.in( "chMoleIsot", isotopesSelectedNameList ) )
+                .add( Restrictions.ge( "wavenbMax", spectralRangeLower ) )
+                .add( Restrictions.le( "wavenbMin", spectralRangeUpper ) )
+                .add( Restrictions.eq( "codeQuantLower",transitionLower ) );
+            criteria.setProjection( Projections.distinct( Projections.property( "codeQuantUpper" ) ));
+
+        final List<String> transitions = selectAllByCriteria( String.class, criteria );
+        return new HashSet<String>( transitions );
+    }
 
     @NotNull

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

@@ -1 +1 @@
 package com.ether.dao;
 
+import com.ether.IsotopeG09;
 import com.ether.IsotopeIasiG03;
 
@@ -25 +26 @@
     {
         super( IsotopeIasiG03.class );
+    }
+
+     @NotNull
+    public Set<String> getTransitionsUpperByTransitionLower( final List<String> isotopesSelectedNameList, final Float spectralRangeLower, final Float spectralRangeUpper , final String transitionLower)
+            throws PersistenceException
+    {
+
+          final DetachedCriteria criteria = DetachedCriteria.forClass( IsotopeIasiG03.class )
+                .add( Restrictions.in( "chMoleIsot", isotopesSelectedNameList ) )
+                .add( Restrictions.ge( "wavenbMax", spectralRangeLower ) )
+                .add( Restrictions.le( "wavenbMin", spectralRangeUpper ) )
+                .add( Restrictions.eq( "codeQuantLower",transitionLower ) );
+            criteria.setProjection( Projections.distinct( Projections.property( "codeQuantUpper" ) ));
+
+        final List<String> transitions = selectAllByCriteria( String.class, criteria );
+        return new HashSet<String>( transitions );
     }
 

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

@@ -25 +25 @@
         super( IsotopeIasiG09.class );
     }
+
+     @NotNull
+    public Set<String> getTransitionsUpperByTransitionLower( final List<String> isotopesSelectedNameList, final Float spectralRangeLower, final Float spectralRangeUpper , final String transitionLower)
+            throws PersistenceException
+    {
+
+          final DetachedCriteria criteria = DetachedCriteria.forClass( IsotopeIasiG09.class )
+                .add( Restrictions.in( "chMoleIsot", isotopesSelectedNameList ) )
+                .add( Restrictions.ge( "wavenbMax", spectralRangeLower ) )
+                .add( Restrictions.le( "wavenbMin", spectralRangeUpper ) )
+                .add( Restrictions.eq( "codeQuantLower",transitionLower ) );
+            criteria.setProjection( Projections.distinct( Projections.property( "codeQuantUpper" ) ));
+
+        final List<String> transitions = selectAllByCriteria( String.class, criteria );
+        return new HashSet<String>( transitions );
+    }
+
+
 
     @NotNull

geisa/persistence/interface/com/ether/dao/IsotopeG03DAO.java

@@ -28 +28 @@
 
     @NotNull
-    List<IsotopeG03> getTransitionsByIsotopeG03NameByTransitionLower( final String isotopeName, final Float spectralRangeLower, final Float spectralRangeUpper, final String transitionLower)
+    Set<String> getTransitionsUpperByTransitionLower( final List<String> isotopeNameArray,final Float spectralRangeLower, final Float spectralRangeUpper, final String transitionLower)
             throws PersistenceException;
 

geisa/persistence/interface/com/ether/dao/IsotopeG09DAO.java

@@ -18 +18 @@
 {
     @NotNull
+        Set<String> getTransitionsUpperByTransitionLower( final List<String> isotopeNameArray,final Float spectralRangeLower, final Float spectralRangeUpper, final String transitionLower)
+                throws PersistenceException;
+
+    @NotNull
     Set<String> getTransitionsLower( final List<String> isotopesSelectedNameList, final Float spectralRangeLower, final Float spectralRangeUpper )
             throws PersistenceException;

geisa/persistence/interface/com/ether/dao/IsotopeIasiG03DAO.java

@@ -18 +18 @@
 //    @Nullable
 //    Plateform getPlateformById( @NotNull final Integer plateformId ) throws PersistenceException;
+    @NotNull
+    Set<String> getTransitionsUpperByTransitionLower( final List<String> isotopeNameArray,final Float spectralRangeLower, final Float spectralRangeUpper, final String transitionLower)
+             throws PersistenceException;
 
 

geisa/persistence/interface/com/ether/dao/IsotopeIasiG09DAO.java

@@ -17 +17 @@
         extends DomainAccessObject<IsotopeIasiG09, Integer>
 {
+    @NotNull
+    Set<String> getTransitionsUpperByTransitionLower( final List<String> isotopeNameArray,final Float spectralRangeLower, final Float spectralRangeUpper, final String transitionLower)
+            throws PersistenceException;
+
+
    @NotNull
     Set<String> getTransitionsLower( final List<String> isotopesSelectedNameList, final Float spectralRangeLower, final Float spectralRangeUpper )
             throws PersistenceException;
 
-    @NotNull
+   @NotNull
     Set<String> getTransitionsUpper( final List<String> isotopesSelectedNameList, final Float spectralRangeLower, final Float spectralRangeUpper )
             throws PersistenceException;