[Isis-fish-commits] r3258 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check

18 Apr 2011

Author: chatellier
Date: 2011-04-18 13:49:02 +0000 (Mon, 18 Apr 2011)
New Revision: 3258

Log:
Fix a lot of potential NPE

Modified:
   isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java

Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java
===================================================================

--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java	2011-04-18 13:40:19 UTC (rev 3257)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java	2011-04-18 13:49:02 UTC (rev 3258)
@@ -33,6 +33,8 @@
 import java.util.List;
 import java.util.Set;
 
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.xwork.StringUtils;
 import org.nuiton.math.matrix.MatrixIterator;
 import org.nuiton.math.matrix.MatrixND;
 
@@ -361,57 +363,57 @@
     }
 
     static public void check(FisheryRegion region, CheckResult result){
-        if("".equals(region.getName())){
+        if (StringUtils.isBlank(region.getName())) {
             result.addWarning(region, _("isisfish.error.empty.name"));
         }
         
         List<Zone> secteurs = region.getZone();
-        if(secteurs.size() == 0){
+        if (CollectionUtils.isEmpty(secteurs)) {
             result.addWarning(region, _("isisfish.error.undefined.sector"));
-        }else{
-            for(Zone zone : secteurs){
+        } else {
+            for(Zone zone : secteurs) {
                 check(zone, result);
             }
         }
         List<Cell> mailles = region.getCell();
-        if(mailles.size() == 0){
+        if (CollectionUtils.isEmpty(mailles)) {
             result.addWarning(region, _("isisfish.error.undefined.mesh"));
-        }else{
-            for(Cell cell : mailles){
+        } else {
+            for (Cell cell : mailles) {
                 check(cell, result);
             }
         }
         List<Species> metaPops = region.getSpecies();
-        if(metaPops.size() == 0){
+        if (CollectionUtils.isEmpty(metaPops)) {
             result.addWarning(region, _("isisfish.error.undefined.meta.population"));
-        }else{
-            for(Species species : metaPops){
+        } else {
+            for (Species species : metaPops) {
                 check(species, result);
             }
         }
         List<Metier> metiers = region.getMetier();
-        if(metiers.size() == 0){
+        if (CollectionUtils.isEmpty(metiers)) {
             result.addWarning(region, _("isisfish.error.undefined.meta.population"));
-        }else{
-            for(Metier metier : metiers){
+        } else {
+            for (Metier metier : metiers) {
                 check(metier, result);
             }
         }
         List<Strategy> strategies = region.getStrategy();
-        if(strategies.size() == 0){
+        if (CollectionUtils.isEmpty(strategies)){
             result.addWarning(region, _("isisfish.error.undefined.stategy"));
-        }else{
-            for(Strategy strategy : strategies){
+        } else {
+            for (Strategy strategy : strategies) {
                 check(strategy, result);
             }
         }
     }
 
     static public void check(Zone secteur, CheckResult result){
-        if("".equals(secteur.getName())){
+        if (StringUtils.isBlank(secteur.getName())) {
             result.addWarning(secteur, _("isisfish.error.empty.name"));
         }
-        if(secteur.getCell().size() == 0){
+        if (CollectionUtils.isEmpty(secteur.getCell())) {
             result.addWarning(secteur, _("isisfish.error.undefined.mesh.sector"));
         }
     }
@@ -421,17 +423,17 @@
     }
 
 
-    static public void check(Strategy strategy, CheckResult result){
-        if("".equals(strategy.getName())){
+    static public void check(Strategy strategy, CheckResult result) {
+        if (StringUtils.isBlank(strategy.getName())) {
             result.addWarning(strategy, _("isisfish.error.empty.name"));
         }
         check(strategy.getSetOfVessels(), result);
         
         List<StrategyMonthInfo> smi = strategy.getStrategyMonthInfo();
-        if(smi.size() != 12){
+        if (smi == null || smi.size() != 12) {
             result.addWarning(strategy, _("isisfish.error.undefined.stategy.months"));
-        }else{
-            for(StrategyMonthInfo info : smi){
+        } else {
+            for (StrategyMonthInfo info : smi) {
                 check(info, result);
             }
         }
@@ -440,22 +442,22 @@
 
     static public void check(SetOfVessels sov, CheckResult result){
         check(sov.getPort(), result);
-        if(sov.getNumberOfVessels() < 0){
+        if (sov.getNumberOfVessels() < 0) {
             result.addWarning(sov, _("isisfish.error.invalid.number"));
         }
-        if(sov.getFixedCosts() < 0){
+        if (sov.getFixedCosts() < 0) {
             result.addWarning(sov, _("isisfish.error.invalid.costs.fix"));
         }
         Collection<EffortDescription> efforts = sov.getPossibleMetiers();
-        if(efforts.size() == 0){
+        if (efforts.size() == 0) {
             result.addWarning(sov, _("isisfish.error.not.possible.metier"));
-        }else{
-            for(EffortDescription effort : efforts) {
+        } else {
+            for (EffortDescription effort : efforts) {
                 check(effort, result);
             }
         }
     }
-    
+
     // TODO check for VesselType, TripType, Port, StrategyMonthInfo
     static public void check(EffortDescription effort, CheckResult result){

    

[Isis-fish-commits] r3258 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check

chatellier＠users.labs.libre-entreprise.org