r1011 - in trunk: coser-business/src/main/java/fr/ifremer/coser/services coser-ui/src/main/java/fr/ifremer/coser/ui/selection - Coser-commits

16 Jul 2012

Author: echatellier
Date: 2012-07-16 17:11:37 +0200 (Mon, 16 Jul 2012)
New Revision: 1011

Url: http://forge.codelutin.com/repositories/revision/coser/1011

Log:
fixes #1323: Modifier le filtre par type 

Modified:
   trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java
   trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx
   trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java
   trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionView.jaxx

Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java
===================================================================

--- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java	2012-07-16 14:47:51 UTC (rev 1010)
+++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java	2012-07-16 15:11:37 UTC (rev 1011)
@@ -1981,65 +1981,62 @@
             }
         }
 
-        // third, filter specy list with specy types filter
-        if (CollectionUtils.isNotEmpty(filterSpecyType)) {
-            // load map SpecyName > numSys
-            Map<String, Integer> map = new HashMap<String, Integer>();
-            Iterator<String[]> refTaxIterator = project.getRefTaxSpecies().iterator(true);
-            while (refTaxIterator.hasNext()) {
-                // "C_Perm";"NumSys";"NivSys";"C_VALIDE";"L_VALIDE";"AA_VALIDE";"C_TxPère";"Taxa"
-                String[] tuple = refTaxIterator.next();
-                String specyName = tuple[3];
-                Integer iNumSys = Integer.valueOf(tuple[1]);
-                map.put(specyName, iNumSys);
-            }
+        // load map SpecyName > numSys
+        Map<String, Integer> map = new HashMap<String, Integer>();
+        Iterator<String[]> refTaxIterator = project.getRefTaxSpecies().iterator(true);
+        while (refTaxIterator.hasNext()) {
+            // "C_Perm";"NumSys";"NivSys";"C_VALIDE";"L_VALIDE";"AA_VALIDE";"C_TxPère";"Taxa"
+            String[] tuple = refTaxIterator.next();
+            String specyName = tuple[3];
+            Integer iNumSys = Integer.valueOf(tuple[1]);
+            map.put(specyName, iNumSys);
+        }
 
-            // load specy type map SpecyTypeName > [min, max]
-            // iteration sur les type d'especes
-            Map<String, Integer[]> mapType = new HashMap<String, Integer[]>();
-            Iterator<String[]> itTypeSpecies = project.getTypeEspeces().iterator(true);
-            while (itTypeSpecies.hasNext()) {
-                // "Types";"Commentaire";"NumSys min";"NumSys max","Code"
-                String[] tuple = itTypeSpecies.next();
-                String specyType = tuple[0];
+        // load specy type map SpecyTypeName > [min, max]
+        // iteration sur les type d'especes
+        Map<String, Integer[]> mapType = new HashMap<String, Integer[]>();
+        Iterator<String[]> itTypeSpecies = project.getTypeEspeces().iterator(true);
+        while (itTypeSpecies.hasNext()) {
+            // "Types";"Commentaire";"NumSys min";"NumSys max","Code"
+            String[] tuple = itTypeSpecies.next();
+            String specyType = tuple[0];
 
-                if (filterSpecyType.contains(specyType)) {
-                    Integer iMinNumSys = Integer.valueOf(tuple[2]);
-                    Integer iMaxNumSys = Integer.valueOf(tuple[3]);
-                    mapType.put(specyType, new Integer[]{iMinNumSys, iMaxNumSys});
-                }
+            if (filterSpecyType.contains(specyType)) {
+                Integer iMinNumSys = Integer.valueOf(tuple[2]);
+                Integer iMaxNumSys = Integer.valueOf(tuple[3]);
+                mapType.put(specyType, new Integer[]{iMinNumSys, iMaxNumSys});
             }
+        }
+        
+        // iteration sur les especes trouvées
+        Iterator<String> itSpecies = result.iterator();
+        while (itSpecies.hasNext()) {
+            String specy = itSpecies.next();
+            Integer specyNumSys = map.get(specy);
             
-            // iteration sur les especes trouvées
-            Iterator<String> itSpecies = result.iterator();
-            while (itSpecies.hasNext()) {
-                String specy = itSpecies.next();
-                Integer specyNumSys = map.get(specy);
-                
-                if (specyNumSys == null) {
-                    // ca ne peut pas arriver, ce cs est valider
-                    // par un control
-                    if (log.isWarnEnabled()) {
-                        log.warn("Can't find specy " + specy + " in reftax");
-                    }
-                    itSpecies.remove();
-                    continue;
+            if (specyNumSys == null) {
+                // ca ne peut pas arriver, ce cs est valider
+                // par un control
+                if (log.isWarnEnabled()) {
+                    log.warn("Can't find specy " + specy + " in reftax");
                 }
+                itSpecies.remove();
+                continue;
+            }
 
-                // test si le numsys est dans les bornes d'un
-                // des type d'espece demandé
-                boolean foundInFilter = false;
-                for (Integer[] bornes : mapType.values()) {
-                    if (specyNumSys >= bornes[0]
-                        && specyNumSys <= bornes[1]){
-                        foundInFilter = true;
-                    }
+            // test si le numsys est dans les bornes d'un
+            // des type d'espece demandé
+            boolean foundInFilter = false;
+            for (Integer[] bornes : mapType.values()) {
+                if (specyNumSys >= bornes[0]
+                    && specyNumSys <= bornes[1]){
+                    foundInFilter = true;
                 }
-                
-                if (!foundInFilter) {
-                    itSpecies.remove();
-                }
             }
+            
+            if (!foundInFilter) {
+                itSpecies.remove();
+            }
         }
 
         Collections.sort(result);

Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx
===================================================================
--- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx	2012-07-16 14:47:51 UTC (rev 1010)
+++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx	2012-07-16 15:11:37 UTC (rev 1011)
@@ -5,7 +5,7 @@
   $Id$
   $HeadURL$
   %%
-  Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric
+  Copyright (C) 2010 - 2012 Ifremer, Codelutin, Chatellier Eric
   %%
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as

Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java
===================================================================
--- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java	2012-07-16 14:47:51 UTC (rev 1010)
+++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java	2012-07-16 15:11:37 UTC (rev 1011)
@@ -394,6 +394,10 @@
         view.getStataMapInfo().setMap(view.getStrataMap().getMapBean());
         view.getStataMapInfo().setShowCoordsInfoLine(true);
         view.getStataMapInfo().setShowInfoLine(true);
+        
+        // fill species type selection by default
+        int count = view.getTypeSpeciesModel().getSize();
+        view.getTypeSpeciesList().addSelectionInterval(0, count - 1);
 
     }
 

Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionView.jaxx
===================================================================
--- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionView.jaxx	2012-07-16 14:47:51 UTC (rev 1010)
+++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionView.jaxx	2012-07-16 15:11:37 UTC (rev 1011)
@@ -5,7 +5,7 @@
   $Id$
   $HeadURL$
   %%
-  Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric
+  Copyright (C) 2010 - 2012 Ifremer, Codelutin, Chatellier Eric
   %%
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as

    

r1011 - in trunk: coser-business/src/main/java/fr/ifremer/coser/services coser-ui/src/main/java/fr/ifremer/coser/ui/selection

echatellier＠users.forge.codelutin.com

tags

participants (1)