Changeset 542 for geisa/service

Timestamp:

07/30/12 18:23:29 (12 years ago)

Author:

npipsl

Message:

Début raffraichissement menu transition quand on clique dessus

Location:

geisa/service

Files:

• implementation/com/ether/GeisaServiceImpl.java (modified) (2 diffs)
• interface/com/ether/GeisaService.java (modified) (1 diff)

geisa/service/implementation/com/ether/GeisaServiceImpl.java

@@ -51 +51 @@
     }
 
-    @NotNull
-    @Transactional(readOnly = true)
-    public List<Pair> getTransitionsLU( final List<String> isotopeNameArray, final Float spectralRangeLower, final Float spectralRangeUpper )
-            throws ServiceException
-    {
-        try
-        {
-            return _isotopeG03DAO.getTransitionsLU( isotopeNameArray, spectralRangeLower, spectralRangeUpper );
-        }
-        catch( PersistenceException e )
-        {
-            throw new ServiceException( ServiceException.ServiceCode.ISOTOPE_NOT_FOUND, e );
-        }
-    }
+
 
     @NotNull
@@ -89 +76 @@
         }
     }
+
+    @NotNull
+    @Transactional(readOnly = true)
+    public Set<String> getTransitionsUpperByTransitionUpper( final Object geisaSelectedDatabase, final List<String> isotopesSelectedNameList, final Float spectralRangeLower, final Float spectralRangeUpper, final String transitionUpper)
+            throws ServiceException
+    {
+        try
+        {
+            if(geisaSelectedDatabase.equals( IsotopeG03.class.toString() ))
+                            return _isotopeG03DAO.getTransitionsUpperByTransitionUpper( isotopesSelectedNameList, spectralRangeLower, spectralRangeUpper, transitionUpper );
+                        else if(geisaSelectedDatabase.equals( IsotopeG09.class.toString() ))
+                            return _isotopeG09DAO.getTransitionsUpperByTransitionUpper( isotopesSelectedNameList, spectralRangeLower, spectralRangeUpper, transitionUpper );
+                        else if(geisaSelectedDatabase.equals( IsotopeIasiG03.class.toString() ))
+                            return _isotopeIasiG03DAO.getTransitionsUpperByTransitionUpper( isotopesSelectedNameList, spectralRangeLower, spectralRangeUpper, transitionUpper );
+                        else
+                            return _isotopeIasiG09DAO.getTransitionsUpperByTransitionUpper( isotopesSelectedNameList, spectralRangeLower, spectralRangeUpper, transitionUpper );
+
+
+        }
+        catch( PersistenceException e )
+        {
+            throw new ServiceException( ServiceException.ServiceCode.ISOTOPE_NOT_FOUND, e );
+        }
+    }
+
+
 
     @NotNull

geisa/service/interface/com/ether/GeisaService.java

@@ -21 +21 @@
     List<IsotopeG03> getTransitionsByIsotopeG03Name( final List<String> isotopeNameArray, final Float spectralRangeLower, final Float spectralRangeUpper ) throws ServiceException;
 
-    @NotNull
-    List<Pair> getTransitionsLU( final List<String> isotopeNameArray, final Float spectralRangeLower, final Float spectralRangeUpper ) throws ServiceException;
 
     @NotNull
     Set<String> getTransitionsUpperByTransitionLower( final Object geisaSelectedDatabase, final List<String> isotopesSelectedNameList, final Float spectralRangeLower, final Float spectralRangeUpper, final String transitionLower )
               throws ServiceException;
+
+    @NotNull
+    Set<String> getTransitionsUpperByTransitionUpper( final Object geisaSelectedDatabase, final List<String> isotopesSelectedNameList, final Float spectralRangeLower, final Float spectralRangeUpper, final String transitionUpper )
+              throws ServiceException;
+
     @NotNull
     Set<String> getTransitionsLower( final Object geisaSelectedDatabase, final List<String> isotopesSelectedNameList, final Float spectralRangeLower, final Float spectralRangeUpper )