[Isis-fish-data-commits] r154 - trunk/exports

30 Jun 2009

Author: chatellier
Date: 2009-06-30 08:19:59 +0000 (Tue, 30 Jun 2009)
New Revision: 154

Modified:
   trunk/exports/CellsDefinition.java
   trunk/exports/RegionDefinition.java
   trunk/exports/ZonesDefinition.java
Log:
Remove deprecated method use.

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

--- trunk/exports/CellsDefinition.java	2009-06-30 08:15:25 UTC (rev 153)
+++ trunk/exports/CellsDefinition.java	2009-06-30 08:19:59 UTC (rev 154)
@@ -1,22 +1,19 @@
 package exports;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import static org.codelutin.i18n.I18n._;
 
 import java.io.Writer;
 import java.util.List;
 
-import static org.codelutin.i18n.I18n._;
-import org.codelutin.math.matrix.*;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.codelutin.topia.TopiaContext;
 
-import fr.ifremer.isisfish.entities.*;
+import fr.ifremer.isisfish.datastore.SimulationStorage;
+import fr.ifremer.isisfish.entities.Cell;
 import fr.ifremer.isisfish.export.Export;
-import fr.ifremer.isisfish.types.Date;
-import fr.ifremer.isisfish.datastore.SimulationStorage;
-import fr.ifremer.isisfish.datastore.ResultStorage;
+import fr.ifremer.isisfish.util.Doc;
 
-import fr.ifremer.isisfish.util.Doc; // pour pouvoir afficher une aide contextuelle (BUG#1605)
-
 /**
  * CellsDefinition.java
  *
@@ -28,7 +25,7 @@
  * Last update: $Date: 2007-05-24 09:30:07 $
  * by : $Author: bpoussin $
  */
- @Doc(value="do the doc of class CellsDefinition")
+@Doc(value="do the doc of class CellsDefinition")
 public class CellsDefinition implements Export {
 
     /** to use log facility, just put in your code: log.info("..."); */
@@ -58,11 +55,14 @@
     }
 
     public void export(SimulationStorage simulation, Writer out) throws Exception {
-        List<Cell> cells = simulation.getFisheryRegion().getCell();
+        TopiaContext tx = simulation.getStorage().beginTransaction();
+        List<Cell> cells = SimulationStorage.getFisheryRegion(tx).getCell();
         
         for (Cell cell : cells) {
             out.write(cell + ";" + cell.getLongitude() + ";" + cell.getLatitude() + "\n");
         }
+        
+        tx.closeContext();
     }
 
 }

Modified: trunk/exports/RegionDefinition.java
===================================================================
--- trunk/exports/RegionDefinition.java	2009-06-30 08:15:25 UTC (rev 153)
+++ trunk/exports/RegionDefinition.java	2009-06-30 08:19:59 UTC (rev 154)
@@ -6,12 +6,11 @@
 import java.io.Writer;
 
 import static org.codelutin.i18n.I18n._;
-import org.codelutin.math.matrix.*;
+import org.codelutin.topia.TopiaContext;
 
 import fr.ifremer.isisfish.entities.*;
 import fr.ifremer.isisfish.export.Export;
 import fr.ifremer.isisfish.datastore.SimulationStorage;
-import fr.ifremer.isisfish.datastore.ResultStorage;
 
 import fr.ifremer.isisfish.util.Doc; // pour pouvoir afficher une aide contextuelle (BUG#1605)
 
@@ -26,7 +25,7 @@
  * Last update: $Date: 2007-05-24 10:05:22 $
  * by : $Author: bpoussin $
  */
- @Doc(value="do the doc of class RegionDefinition")
+@Doc(value="do the doc of class RegionDefinition")
 public class RegionDefinition implements Export {
 
     /** to use log facility, just put in your code: log.info("..."); */
@@ -57,7 +56,9 @@
 
     public void export(SimulationStorage simulation, Writer out) throws Exception {
         // NomRegion LatituteMin LatitudeMax LongitudeMin LongitudeMax PasLatitude PasLongitude
-        FisheryRegion region = simulation.getFisheryRegion();
+        TopiaContext tx = simulation.getStorage().beginTransaction();
+        FisheryRegion region = SimulationStorage.getFisheryRegion(tx);
+        
         out.write(region.getName() + ";"
                 + region.getMinLatitude() + ";"
                 + region.getMaxLatitude() + ";" 
@@ -66,6 +67,8 @@
                 + region.getCellLengthLatitude() + ";" 
                 + region.getCellLengthLongitude() +
                 "\n");
+        
+        tx.closeContext();
     }
 
 }

Modified: trunk/exports/ZonesDefinition.java
===================================================================
--- trunk/exports/ZonesDefinition.java	2009-06-30 08:15:25 UTC (rev 153)
+++ trunk/exports/ZonesDefinition.java	2009-06-30 08:19:59 UTC (rev 154)
@@ -7,13 +7,12 @@
 import java.util.List;
 
 import static org.codelutin.i18n.I18n._;
-import org.codelutin.math.matrix.*;
+import org.codelutin.topia.TopiaContext;
 
 import fr.ifremer.isisfish.entities.*;
 import fr.ifremer.isisfish.export.Export;
 import fr.ifremer.isisfish.types.Date;
 import fr.ifremer.isisfish.datastore.SimulationStorage;
-import fr.ifremer.isisfish.datastore.ResultStorage;
 
 import fr.ifremer.isisfish.util.Doc; // pour pouvoir afficher une aide contextuelle (BUG#1605)
 
@@ -28,7 +27,7 @@
  * Last update: $Date: 2007-05-24 09:30:07 $
  * by : $Author: bpoussin $
  */
- @Doc(value="do the doc of class ZoneDefinition")
+@Doc(value="do the doc of class ZoneDefinition")
 public class ZonesDefinition implements Export {
 
     /** to use log facility, just put in your code: log.info("..."); */
@@ -58,7 +57,9 @@
     }
 
     public void export(SimulationStorage simulation, Writer out) throws Exception {
-        List<Zone> zones = simulation.getFisheryRegion().getZone();
+        TopiaContext tx = simulation.getStorage().beginTransaction();
+        List<Zone> zones = SimulationStorage.getFisheryRegion(tx).getZone();
+        
         Date lastDate = simulation.getResultStorage().getLastDate();       
         
         for (Date date = new Date(0); !date.after(lastDate); date = date.next() ) {
@@ -68,6 +69,8 @@
                 }
             }
         }
+        
+        tx.closeContext();
     }
 
 }

    

[Isis-fish-data-commits] r154 - trunk/exports

chatellier＠users.labs.libre-entreprise.org