Author: chatellier Date: 2009-09-18 07:46:20 +0000 (Fri, 18 Sep 2009) New Revision: 2630 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleHandler.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DataMapList.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/ResultatLayer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Always use logger for force writing in debug.txt file Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-09-16 12:02:04 UTC (rev 2629) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-09-18 07:46:20 UTC (rev 2630) @@ -145,7 +145,9 @@ // action after ui launched config.doAction(IsisConfig.STEP_AFTER_UI); } catch (Exception e) { - e.printStackTrace(); + if (log.isErrorEnabled()) { + log.error("Global IsisFish exception", e); + } quit(); } catch (LinkageError e) { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java 2009-09-16 12:02:04 UTC (rev 2629) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java 2009-09-18 07:46:20 UTC (rev 2630) @@ -16,6 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ##% */ + package fr.ifremer.isisfish.logging.console; import org.apache.commons.logging.Log; @@ -329,12 +330,15 @@ } public static void IsisStart() { - System.setProperty("org.apache.commons.logging.LogFactory", - LutinLogFactory.class.getName()); + // LutinLogFactory make memory leak !!! + //System.setProperty("org.apache.commons.logging.LogFactory", + // LutinLogFactory.class.getName()); try { IsisFish.init(); } catch (Exception e) { - e.printStackTrace(); + if (log.isErrorEnabled()) { + log.error("Can't init isis", e); + } } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleHandler.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleHandler.java 2009-09-16 12:02:04 UTC (rev 2629) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleHandler.java 2009-09-18 07:46:20 UTC (rev 2630) @@ -272,7 +272,9 @@ } model.allItems.add(newLine); } catch (IOException e) { - e.printStackTrace(); + if (log.isErrorEnabled()) { + log.error("Can't read log file", e); + } } } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DataMapList.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DataMapList.java 2009-09-16 12:02:04 UTC (rev 2629) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DataMapList.java 2009-09-18 07:46:20 UTC (rev 2630) @@ -22,23 +22,27 @@ import java.util.Enumeration; import java.util.Vector; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import com.bbn.openmap.omGraphics.OMGraphicList; import com.bbn.openmap.proj.Projection; /** * DataMapList.java - * - * + * * Created: Mon Apr 22 16:27:28 2002 * * @author <a href="mailto:seb.regnier at free.fr"></a> */ - public class DataMapList implements Serializable { - /** */ - private static final long serialVersionUID = 1L; + /** serialVersionUID. */ + private static final long serialVersionUID = 7147651962434190318L; + /** Class logger. */ + private static Log log = LogFactory.getLog(DataMapList.class); + protected Motif motif; protected DataMapInfo info; @@ -192,11 +196,15 @@ double tmp; for (Enumeration enu = dataMap.elements(); enu.hasMoreElements();) { tmp = Math.min(min, ((DataMap) enu.nextElement()).getValue()); - if (tmp > 0) + if (tmp > 0) { min = tmp; - else - System.err.println("getPositiveMinDataMapValue:" + } + else { + if (log.isErrorEnabled()) { + log.error("getPositiveMinDataMapValue:" + " error negative value encountered"); + } + } } return min; } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java 2009-09-16 12:02:04 UTC (rev 2629) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java 2009-09-18 07:46:20 UTC (rev 2630) @@ -163,7 +163,9 @@ } } } catch(Exception eee) { - log.error("Impossible d'initialiser la Region", eee); + if (log.isErrorEnabled()) { + log.error("Impossible d'initialiser la Region", eee); + } } } @@ -180,8 +182,8 @@ } /** - * Retourne la liste des mailles selectionnées - */ + * Retourne la liste des mailles selectionnées + */ public List<Cell> getSelectedCells(){ try { List<Cell> result = new ArrayList<Cell>(); @@ -201,7 +203,9 @@ } return result; } catch (RuntimeException eee) { - eee.printStackTrace(); + if (log.isErrorEnabled()) { + log.error("Can't find selected cells", eee); + } throw eee; } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/ResultatLayer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/ResultatLayer.java 2009-09-16 12:02:04 UTC (rev 2629) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/ResultatLayer.java 2009-09-18 07:46:20 UTC (rev 2630) @@ -31,6 +31,8 @@ import javax.swing.JOptionPane; import javax.swing.JPanel; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.codelutin.math.matrix.MatrixND; import com.bbn.openmap.LatLonPoint; @@ -47,17 +49,18 @@ /** * ResultatLayer.java * - * * Created: Mon Apr 15 15:14:40 2002 * * @author <a href="mailto:seb.regnier at free.fr"></a> */ - public class ResultatLayer extends OMGraphicHandlerLayer implements MapMouseListener { - /** */ + /** serialVersionUID. */ private static final long serialVersionUID = 387094105186421164L; + + /** Class logger. */ + private static Log log = LogFactory.getLog(ResultatLayer.class); protected DataMapList dataMapList = new DataMapList(); @@ -126,21 +129,12 @@ break; } } - /* - * #java.util.logging.Logger.getLogger("fr.ifremer.map.ResultatLayer.setMatriceInfo").fine("POSITIONS - * DES ZONES: "+position);# - */ if (position == -1 || vzone == null || vzone.size() == 0) { setDataMapList(dml); return; } - /* - * #java.util.logging.Logger.getLogger("fr.ifremer.map.ResultatLayer.setMatriceInfo").fine("NB - * ZONES: "+vzone.size());# - */ - Vector<float[]> latitude = new Vector<float[]>(); Vector<float[]> longitude = new Vector<float[]>(); float pasMailleLatitude = 0f; @@ -167,8 +161,9 @@ longitude.add(lon); } } catch (Exception eee) { - java.util.logging.Logger.getLogger("fr.ifremer.map.ResultatLayer") - .severe("erreur dans la creation du datamaplist"); + if (log.isErrorEnabled()) { + log.error("Erreur dans la creation du datamaplist", eee); + } setDataMapList(dml); return; } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-09-16 12:02:04 UTC (rev 2629) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-09-18 07:46:20 UTC (rev 2630) @@ -701,6 +701,12 @@ plan.init(planContext); } } catch (Exception eee) { + // add manual log + // we are in a thread, IsisFishRuntimeException is displyed + // outside a log + if (log.isErrorEnabled()) { + log.error(_("isisfish.error.evaluate.preplan.script"), eee); + } throw new IsisFishRuntimeException(_("isisfish.error.evaluate.preplan.script"), eee); } } @@ -715,8 +721,10 @@ log.info("Simulation generee: " + subJob.getId()); simulationService.submitSubJob(subJob); } catch (Exception eee) { - log.error(_("Can't add simulation: ", job.getItem() + if (log.isErrorEnabled()) { + log.error(_("Can't add simulation: %s", job.getItem() .getControl().getId()), eee); + } } } @@ -822,7 +830,7 @@ } public void finished(SimulationJob job, SimulationStorage sim) { - // doNext = true; + // doNext = true; // appel de tous les plans pour modifier la simulation // EC20090716 : use param.getAnalysePlans() instances, Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2009-09-16 12:02:04 UTC (rev 2629) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2009-09-18 07:46:20 UTC (rev 2630) @@ -1,3 +1,21 @@ +/* *##% + * Copyright (C) 2009 Code Lutin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + package fr.ifremer.isisfish.simulator.sensitivity; import java.io.File; @@ -21,11 +39,12 @@ private static Log log = LogFactory .getLog(AbstractSensitivityCalculator.class); - /* - * Method to create the isis.factors dataframe in R - * @param Design plan of the sensitivity analysis + /** + * Method to create the isis.factors dataframe in R. + * + * @param plan Design plan of the sensitivity analysis + * @param outputdirectory ??? */ - public void setIsisFactorsR(DesignPlan plan, File outputdirectory) { String nomFacteur = "nomFacteur<-c(%s)"; @@ -153,7 +172,9 @@ engine.voidEval("save.image()"); } catch (RException eee) { - eee.printStackTrace(); + if (log.isErrorEnabled()) { + log.error("R evaluation failed", eee); + } throw new RuntimeException("R evaluation failed", eee); // Error while retrieving scenario } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2009-09-16 12:02:04 UTC (rev 2629) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2009-09-18 07:46:20 UTC (rev 2630) @@ -27,8 +27,7 @@ /** * Facteur de variation des parametres de simulation. * - * @param <E> - * type des valeurs gérées par le facteur + * @param <E> type des valeurs gérées par le facteur * @param <F> type des labels * * La classe doit être {@link Serializable} avec ses valeurs pour permettre Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java 2009-09-16 12:02:04 UTC (rev 2629) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java 2009-09-18 07:46:20 UTC (rev 2630) @@ -88,8 +88,9 @@ @Override protected void goBackToPreviousNode(TreeSelectionEvent event, Exception e) { if (e != null) { -// ErrorDialogUI.showError(e); - e.printStackTrace(); + if (log.isErrorEnabled()) { + log.error("Go bak to previous node", e); + } } // go back to previous node // returnToPreviousNode(getNavigationTree(), event); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx 2009-09-16 12:02:04 UTC (rev 2629) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx 2009-09-18 07:46:20 UTC (rev 2630) @@ -112,8 +112,9 @@ doc.setPage(e.getURL()); } } catch (Exception eee) { - System.out.println("Error for : " + e.getURL()); - eee.printStackTrace(); + if (log.isErrorEnabled()) { + log.error("Can't open system browser", eee); + } } } } Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-09-16 12:02:04 UTC (rev 2629) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-09-18 07:46:20 UTC (rev 2630) @@ -2,7 +2,7 @@ Add\ to\ default\ queue= Analyse\ plan\ error,\ too\ many\ simulation\ for\ %s\ \:\ %s= Can't\ add\ result\ '%1$s'\ at\ date\ %2$s=Can't add result '%1$s' at date %2$s -Can't\ add\ simulation\:\ = +Can't\ add\ simulation\:\ %s= Can't\ create\ simulation\ logger=Can't create simulation logger Can't\ delete\ simulation\ %s\ = Can't\ do\ post\ action\ %s= Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-09-16 12:02:04 UTC (rev 2629) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-09-18 07:46:20 UTC (rev 2630) @@ -2,7 +2,7 @@ Add\ to\ default\ queue= Analyse\ plan\ error,\ too\ many\ simulation\ for\ %s\ \:\ %s= Can't\ add\ result\ '%1$s'\ at\ date\ %2$s=Can't add result '%1$s' at date %2$s -Can't\ add\ simulation\:\ = +Can't\ add\ simulation\:\ %s= Can't\ create\ simulation\ logger=Can't create simulation logger Can't\ delete\ simulation\ %s\ = Can't\ do\ post\ action\ %s=