r387 - in trunk: exports rules scripts - Isis-fish-data-commits

10 Mar 2016

Author: echatellier
Date: 2016-03-10 11:30:06 +0100 (Thu, 10 Mar 2016)
New Revision: 387

Url: http://forge.codelutin.com/projects/isis-fish-data/repository/revisions/387

Log:
Remove use of DaoHelper

Modified:
   trunk/exports/MetierZone.java
   trunk/rules/Cantonnement.java
   trunk/rules/CantonnementPreSimu.java
   trunk/rules/ChangementParamControlablePresimu.java
   trunk/scripts/SiMatrix.java

Modified: trunk/exports/MetierZone.java
===================================================================

--- trunk/exports/MetierZone.java	2016-03-01 16:44:42 UTC (rev 386)
+++ trunk/exports/MetierZone.java	2016-03-10 10:30:06 UTC (rev 387)
@@ -28,7 +28,6 @@
 
 import org.nuiton.math.matrix.*;
 
-import fr.ifremer.isisfish.export.Export;
 import fr.ifremer.isisfish.export.ExportStep;
 import fr.ifremer.isisfish.types.TimeStep;
 import resultinfos.MatrixMetierZone;

Modified: trunk/rules/Cantonnement.java
===================================================================
--- trunk/rules/Cantonnement.java	2016-03-01 16:44:42 UTC (rev 386)
+++ trunk/rules/Cantonnement.java	2016-03-10 10:30:06 UTC (rev 387)
@@ -2,7 +2,7 @@
  * #%L
  * IsisFish data
  * %%
- * Copyright (C) 2006 - 2015 Ifremer, CodeLutin
+ * Copyright (C) 2006 - 2016 Ifremer, CodeLutin
  * %%
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -34,7 +34,6 @@
 
 import org.nuiton.math.matrix.*;
 
-import fr.ifremer.isisfish.IsisFishDAOHelper;
 import fr.ifremer.isisfish.simulator.MetierMonitor;
 import fr.ifremer.isisfish.simulator.SimulationContext;
 import fr.ifremer.isisfish.types.TimeStep;
@@ -169,7 +168,7 @@
         cellMetiers.removeAll(cells);
         
         if (cellMetiers.size() != 0) {
-            ZoneDAO dao = IsisFishDAOHelper.getZoneDAO(context.getDB());
+            ZoneDAO dao = context.getZoneDAO();
             
             //
             // Create new empty zone for cantonnement

Modified: trunk/rules/CantonnementPreSimu.java
===================================================================
--- trunk/rules/CantonnementPreSimu.java	2016-03-01 16:44:42 UTC (rev 386)
+++ trunk/rules/CantonnementPreSimu.java	2016-03-10 10:30:06 UTC (rev 387)
@@ -33,7 +33,6 @@
 
 import org.nuiton.math.matrix.*;
 
-import fr.ifremer.isisfish.IsisFishDAOHelper;
 import fr.ifremer.isisfish.simulator.MetierMonitor;
 import fr.ifremer.isisfish.simulator.SimulationContext;
 import fr.ifremer.isisfish.types.TimeStep;
@@ -139,8 +138,8 @@
     public void init(SimulationContext context) throws Exception {
         SiMatrix siMatrix = SiMatrix.getSiMatrix(context);
         
-        ZoneDAO zoneDao = IsisFishDAOHelper.getZoneDAO(context.getDB());
-        MetierSeasonInfoDAO metierSeasonInfoDao = IsisFishDAOHelper.getMetierSeasonInfoDAO(context.getDB());
+        ZoneDAO zoneDao = context.getZoneDAO();
+        MetierSeasonInfoDAO metierSeasonInfoDao = context.getMetierSeasonInfoDAO();
 
         List<Month> SaisonFermee = Month.getMonths(param_beginMonth, param_endMonth);
         List<Cell> maillefermee = param_zone.getCell();

Modified: trunk/rules/ChangementParamControlablePresimu.java
===================================================================
--- trunk/rules/ChangementParamControlablePresimu.java	2016-03-01 16:44:42 UTC (rev 386)
+++ trunk/rules/ChangementParamControlablePresimu.java	2016-03-10 10:30:06 UTC (rev 387)
@@ -28,7 +28,6 @@
 import org.apache.commons.logging.LogFactory;
 
 import scripts.SiMatrix;
-import fr.ifremer.isisfish.IsisFishDAOHelper;
 import fr.ifremer.isisfish.datastore.RegionStorage;
 import fr.ifremer.isisfish.entities.EffortDescription;
 import fr.ifremer.isisfish.entities.EffortDescriptionDAO;
@@ -144,9 +143,9 @@
                                 List<Month> moisconcerne = new ArrayList<Month>(saison);
                                 moisconcerne.retainAll(SaisonFermee);
                                 
-                                MetierDAO metierDao = IsisFishDAOHelper.getMetierDAO(context.getDB());
-                                MetierSeasonInfoDAO infoDao = IsisFishDAOHelper.getMetierSeasonInfoDAO(context.getDB());
-                                EffortDescriptionDAO effortDao = IsisFishDAOHelper.getEffortDescriptionDAO(context.getDB());
+                                MetierDAO metierDao = context.getMetierDAO();
+                                MetierSeasonInfoDAO infoDao = context.getMetierSeasonInfoDAO();
+                                EffortDescriptionDAO effortDao = context.getEffortDescriptionDAO();
                                 
                                 Metier NouveauMetier = metierDao.create();
                                 NouveauMetier.setName(metier.getName()+" Mois "+moisconcerne.get(0).getMonthNumber()+" a "+moisconcerne.get(moisconcerne.size()-1).getMonthNumber()+" ValeurParam "+nouvelleValeurParam);

Modified: trunk/scripts/SiMatrix.java
===================================================================
--- trunk/scripts/SiMatrix.java	2016-03-01 16:44:42 UTC (rev 386)
+++ trunk/scripts/SiMatrix.java	2016-03-10 10:30:06 UTC (rev 387)
@@ -38,7 +38,6 @@
 import org.nuiton.topia.TopiaContext;
 import org.nuiton.topia.TopiaException;
 
-import fr.ifremer.isisfish.IsisFishDAOHelper;
 import fr.ifremer.isisfish.IsisFishException;
 import fr.ifremer.isisfish.entities.*;
 import fr.ifremer.isisfish.simulator.ResultManager;
@@ -117,7 +116,7 @@
      * @throws TopiaException
      */
     public List<Zone> getZones(TimeStep step) throws TopiaException {
-        ZoneDAO dao = IsisFishDAOHelper.getZoneDAO(db);
+        ZoneDAO dao = context.getZoneDAO();
         List<Zone> result = dao.findAll();
         return result;
     }

    

r387 - in trunk: exports rules scripts

echatellier＠users.forge.codelutin.com

tags

participants (1)