Changeset 244 for ether_megapoli/trunk

Timestamp:

11/09/11 16:34:14 (13 years ago)

Author:

vmipsl

Message:

Sous-menus paramètres

Location:

ether_megapoli/trunk

Files:

• service/implementation/com/ether/EtherServiceImpl.java (modified) (1 diff)
• service/interface/com/ether/EtherService.java (modified) (1 diff)
• web/src/com/ether/Controller.java (modified) (1 diff)

ether_megapoli/trunk/service/implementation/com/ether/EtherServiceImpl.java

@@ -73 +73 @@
     }
 
-    @Nullable
+    @NotNull
     @Transactional(readOnly = true)
     public List<Parametre> getParametersByPlateformId( @NotNull final Integer plateformId )

ether_megapoli/trunk/service/interface/com/ether/EtherService.java

@@ -28 +28 @@
             throws ServiceException;
 
-    @Nullable
+    @NotNull
     List<Parametre> getParametersByPlateformId( @NotNull final Integer plateformId )
             throws ServiceException;

ether_megapoli/trunk/web/src/com/ether/Controller.java

@@ -90 +90 @@
             throws ServiceException, EtherException
     {
-        final List<Parametre> parametersByPlateform = _etherService.getParametersByPlateformId( plateformId );
+        final List<Parametre> fullParametersByPlateform = _etherService.getParametersByPlateformId( plateformId );
+        final List<List<Parametre>> parametersByPlateform = manageMenusForParameterList( fullParametersByPlateform );
 
         final JSONObject result = new JSONObject();
         result.put( ParameterConstants.PARAMETER_PARAMETERS, getJsonHelper().toJSON( parametersByPlateform ) );
         return result;
+    }
+
+    /**
+     * This method manage the sub-menus for the list of parameters (to avoid multiple "Particle Concentration" by example)
+     * The fullParameters must be ordered with parameterName ascendant
+     *
+     * @param fullParameters
+     * @return
+     */
+    @NotNull
+    private List<List<Parametre>> manageMenusForParameterList( @NotNull final List<Parametre> fullParameters )
+    {
+        final List<List<Parametre>> parameterListWithMenu = new ArrayList<List<Parametre>>();
+
+        int i = 0;
+        while( i < fullParameters.size() )
+        {
+            final Parametre fullParameter = fullParameters.get( i );
+            final int firstIndex = fullParameters.indexOf( fullParameter );
+            final int lastIndex = fullParameters.lastIndexOf( fullParameter );
+            final List<Parametre> parameters = fullParameters.subList( firstIndex, lastIndex + 1 );
+            parameterListWithMenu.add( parameters );
+            i += parameters.size();
+        }
+
+        return parameterListWithMenu;
     }