r3175 - in isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish: . datastore entities logging mexico ui/script ui/script/action
Author: chatellier Date: 2011-03-17 10:35:55 +0000 (Thu, 17 Mar 2011) New Revision: 3175 Log: Fix isis exception constructors. Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFishException.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFishRuntimeException.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/StorageException.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/CellImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/FisheryRegionImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/GearImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/MetierImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PortImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/SpeciesImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/TripTypeImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/VesselTypeImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/ZoneImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/BackupAction.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ExportAction.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2005 - 2010 Ifremer, CodeLutin + * Copyright (C) 2005 - 2011 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 @@ -53,13 +53,13 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; +import org.nuiton.i18n.init.ClassPathI18nInitializer; import org.nuiton.math.matrix.DoubleBigVector; import org.nuiton.math.matrix.MatrixFactory; import org.nuiton.topia.TopiaException; import org.nuiton.util.FileUtil; -import org.nuiton.util.LocaleConverter; import org.nuiton.util.Version; -import org.nuiton.widget.SwingUtil; +import org.nuiton.util.converter.LocaleConverter; import fr.ifremer.isisfish.cron.CronService; import fr.ifremer.isisfish.datastore.AnalysePlanStorage; @@ -119,69 +119,71 @@ System.exit(0); } - public static void main(String... args) { + public static void main(String... args) throws Exception { - try { - // permet de faire fonctionner la compilation en webstart - System.setSecurityManager(null); + // catch wall application exception + Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() { + public void uncaughtException(Thread t, Throwable cause) { + if (cause instanceof LinkageError) { + if (log.isFatalEnabled()) { + log.fatal("Linkage error detected", cause); + } - // initialisation de l'application - IsisFish.init(args); + // a real java.lang.Error sometimes happen when + // using non recompiled script due to dependency changes + // this is the better solution found : + // remove isis build directory + FileUtil.deleteRecursively(IsisFish.config.getCompileDirectory()); - if (log.isDebugEnabled()) { - log.debug(_("isisfish.launch.init.done", config.getElapsedTimeAsString())); + ErrorHelper.showErrorDialog(null, _("isisfish.error.linkageerror.title"), cause); + } + else { + if (log.isErrorEnabled()) { + log.error("Global application exception", cause); + } + ErrorHelper.showErrorDialog(null, cause.getMessage(), cause); + } } + }); - // action after init - config.doAction(IsisConfig.STEP_AFTER_INIT); + // permet de faire fonctionner la compilation en webstart + System.setSecurityManager(null); - // initVCS ask for passphrase, ui must be set before - initLookAndFeel(); - - // static vcs init (needed for some actions) - try { - initVCS(); - } catch (Exception eee) { - log.warn(_("Error during vcs initialisation"), eee); - } + // initialisation de l'application + init(args); - if (log.isInfoEnabled()) { - log.info(_("isisfish.launching", config.getElapsedTimeAsString())); - } - - // after init vcs and local data - config.doAction(IsisConfig.STEP_AFTER_INIT_VCS); - - doNuitonMigration(); + if (log.isDebugEnabled()) { + log.debug(_("isisfish.launch.init.done", config.getElapsedTimeAsString())); + } - launchUI(); + // action after init + config.doAction(IsisConfig.STEP_AFTER_INIT); - // action after ui launched - config.doAction(IsisConfig.STEP_AFTER_UI); - - startCronService(); - } catch (Exception e) { - if (log.isErrorEnabled()) { - log.error("Global IsisFish exception", e); - } - quit(); - } catch (LinkageError e) { - - if (log.isFatalEnabled()) { - log.fatal("Linkage error detected", e); - } - - // a real java.lang.Error sometimes happen when - // using non recompiled script due to dependency changes - // this is the better solution found : - // remove isis build directory - FileUtil.deleteRecursively(IsisFish.config.getCompileDirectory()); - // display message - JOptionPane.showMessageDialog(null, _("isisfish.error.linkageerror.message"), - _("isisfish.error.linkageerror.title"), JOptionPane.ERROR_MESSAGE); - // restart isis - quit(); + // initVCS ask for passphrase, ui must be set before + initLookAndFeel(); + + // static vcs init (needed for some actions) + try { + initVCS(); + } catch (Exception eee) { + log.warn(_("Error during vcs initialisation"), eee); } + + if (log.isInfoEnabled()) { + log.info(_("isisfish.launching", config.getElapsedTimeAsString())); + } + + // after init vcs and local data + config.doAction(IsisConfig.STEP_AFTER_INIT_VCS); + + doNuitonMigration(); + + launchUI(); + + // action after ui launched + config.doAction(IsisConfig.STEP_AFTER_UI); + + startCronService(); } /** @@ -329,17 +331,17 @@ } // first load converter and matrixFactory - initConvertersAndMatrixFactory(); - - // after init shutdown hook - Runtime.getRuntime().addShutdownHook(new IsisQuitHook()); + //initConvertersAndMatrixFactory(); // parsing des options à partir des arguments passés config = new IsisConfig(); config.parse(args); // init i18n - I18n.init(config.getLocale()); + I18n.init(new ClassPathI18nInitializer(), config.getLocale()); + + // after init shutdown hook + Runtime.getRuntime().addShutdownHook(new IsisQuitHook()); } /** @@ -620,7 +622,8 @@ welcome.addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent e) { - ((WelcomeUI)e.getSource()).close(); + WelcomeUI ui = (WelcomeUI)e.getSource(); + ui.getHandler().close(ui); } }); @@ -634,7 +637,7 @@ log.error("Can't set frame icon", ex); } } - SwingUtil.center(welcome); + welcome.setLocationRelativeTo(null); welcome.setVisible(true); } else { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFishException.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFishException.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFishException.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2005 - 2010 Ifremer, CodeLutin + * Copyright (C) 2005 - 2011 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 @@ -25,24 +25,32 @@ package fr.ifremer.isisfish; +/** + * Isis non runtime exception. + * + * @author poussin + */ public class IsisFishException extends Exception { /** serialVersionUID. */ private static final long serialVersionUID = -9012018415761616627L; - public IsisFishException() { - super(); - } - + /** + * Constructor with message. + * + * @param message message + */ public IsisFishException(String message) { super(message); } + /** + * Constructor with message and cause. + * + * @param message message + * @param cause cause + */ public IsisFishException(String message, Throwable cause) { super(message, cause); } - - public IsisFishException(Throwable cause) { - super(cause); - } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFishRuntimeException.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFishRuntimeException.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFishRuntimeException.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2006 - 2010 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * Copyright (C) 2006 - 2011 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, 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 @@ -26,8 +26,9 @@ package fr.ifremer.isisfish; /** + * Isis runtime exception. + * * @author poussin - * */ public class IsisFishRuntimeException extends RuntimeException { @@ -35,32 +36,21 @@ private static final long serialVersionUID = 3388901195563202616L; /** + * Constructor with message. * + * @param message message */ - public IsisFishRuntimeException() { - super(); - } - - /** - * @param message - */ public IsisFishRuntimeException(String message) { super(message); } /** - * @param message - * @param cause + * Constructor with message and cause. + * + * @param message message + * @param cause cause */ public IsisFishRuntimeException(String message, Throwable cause) { super(message, cause); } - - /** - * @param cause - */ - public IsisFishRuntimeException(Throwable cause) { - super(cause); - } - } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -152,7 +152,7 @@ lastContentUpdate = System.nanoTime(); lastContentLength = getFile().length(); } catch (IOException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get content", eee); } } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/StorageException.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/StorageException.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/StorageException.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 Ifremer, CodeLutin + * Copyright (C) 2009 - 2011 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 @@ -27,24 +27,36 @@ import fr.ifremer.isisfish.IsisFishException; +/** + * Storage exception. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ public class StorageException extends IsisFishException { /** serialVersionUID. */ private static final long serialVersionUID = -8193638893951824873L; - public StorageException() { - super(); - } - + /** + * Constructor with message. + * + * @param message message + */ public StorageException(String message) { super(message); } + /** + * Constructor with message and cause. + * + * @param message message + * @param cause cause + */ public StorageException(String message, Throwable cause) { super(message, cause); } - - public StorageException(Throwable cause) { - super(cause); - } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/CellImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/CellImpl.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/CellImpl.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -51,7 +51,7 @@ .getFisheryRegion(getTopiaContext()); return result; } catch (StorageException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get fishery region", eee); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/FisheryRegionImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/FisheryRegionImpl.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/FisheryRegionImpl.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -106,7 +106,7 @@ List<Port> result = dao.findAll(); return result; } catch (TopiaException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get port", eee); } } @@ -119,7 +119,7 @@ List<Cell> result = dao.findAll(); return result; } catch (TopiaException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get cell", eee); } } @@ -133,7 +133,7 @@ List<VesselType> result = dao.findAll(); return result; } catch (TopiaException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get vessel type", eee); } } @@ -146,7 +146,7 @@ List<Gear> result = dao.findAll(); return result; } catch (TopiaException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get gear", eee); } } @@ -159,7 +159,7 @@ List<Metier> result = dao.findAll(); return result; } catch (TopiaException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get metier", eee); } } @@ -173,7 +173,7 @@ List<SetOfVessels> result = dao.findAll(); return result; } catch (TopiaException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get setOfVessels", eee); } } @@ -186,7 +186,7 @@ List<Species> result = dao.findAll(); return result; } catch (TopiaException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get species", eee); } } @@ -200,7 +200,7 @@ List<Strategy> result = dao.findAll(); return result; } catch (TopiaException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get strategy", eee); } } @@ -214,7 +214,7 @@ List<TripType> result = dao.findAll(); return result; } catch (TopiaException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get tripType", eee); } } @@ -227,7 +227,7 @@ List<Zone> result = dao.findAll(); return result; } catch (TopiaException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get zone", eee); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/GearImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/GearImpl.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/GearImpl.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -52,7 +52,7 @@ .getFisheryRegion(getTopiaContext()); return result; } catch (StorageException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get fishery region", eee); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/MetierImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/MetierImpl.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/MetierImpl.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -55,7 +55,7 @@ .getFisheryRegion(getTopiaContext()); return result; } catch (StorageException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get fishery region", eee); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -70,10 +70,10 @@ /** serialVersionUID */ private static final long serialVersionUID = 1L; - /** + /* * Overwrite delete. * @throws TopiaException - */ + * @Override public void delete() throws TopiaException { // chatellier 20090317 fix hibernate exception @@ -82,7 +82,7 @@ this.getSpecies().getPopulation().remove(this); super.delete(); - } + }*/ /* * @see fr.ifremer.isisfish.entities.PopulationAbstract#toString() Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PortImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PortImpl.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PortImpl.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -51,7 +51,7 @@ .getFisheryRegion(getTopiaContext()); return result; } catch (StorageException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get fishery region", eee); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -64,7 +64,7 @@ .getFisheryRegion(getTopiaContext()); return result; } catch (StorageException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get fishery region", eee); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/SpeciesImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/SpeciesImpl.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/SpeciesImpl.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -51,7 +51,7 @@ .getFisheryRegion(getTopiaContext()); return result; } catch (StorageException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get fishery region", eee); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -67,7 +67,7 @@ .getFisheryRegion(getTopiaContext()); return result; } catch (StorageException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get fishery region", eee); } } @@ -130,8 +130,7 @@ if (!month.equals(result.getMonth())) { // normalement les StrategyMonthInfo sont dans l'ordre mais // pour etre sur que ca fonctionne on fait un petit test - log - .warn("StrategyMonthInfo not in month order, i take time to find good StrategyMonthInfo"); + log.warn("StrategyMonthInfo not in month order, i take time to find good StrategyMonthInfo"); result = null; for (StrategyMonthInfo smi : smis) { if (month.equals(smi.getMonth())) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -65,7 +65,7 @@ .getFisheryRegion(getTopiaContext()); return result; } catch (StorageException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get fishery region", eee); } } @@ -90,8 +90,7 @@ mat.setValue(metier, value); setProportionMetier(mat); } else { - log - .warn("Can't set proportion of metier, not enough information available"); + log.warn("Can't set proportion of metier, not enough information available"); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/TripTypeImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/TripTypeImpl.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/TripTypeImpl.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -48,11 +48,7 @@ /** serialVersionUID. */ private static final long serialVersionUID = 1L; - /* (non-Javadoc) - * @see org.nuiton.topia.persistence.TopiaEntityAbstract#postCreate() - */ - @Override - public void postCreate() throws TopiaException { + public TripTypeImpl() { setMinTimeBetweenTrip(new TimeUnit(0)); setTripDuration(new TimeUnit(0)); } @@ -63,7 +59,7 @@ .getFisheryRegion(getTopiaContext()); return result; } catch (StorageException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get fishery region", eee); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/VesselTypeImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/VesselTypeImpl.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/VesselTypeImpl.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -48,11 +48,7 @@ /** serialVersionUID. */ private static final long serialVersionUID = 1L; - /* (non-Javadoc) - * @see org.nuiton.topia.persistence.TopiaEntityAbstract#postCreate() - */ - @Override - public void postCreate() throws TopiaException { + public VesselTypeImpl() { setMaxTripDuration(new TimeUnit(0)); } @@ -62,7 +58,7 @@ .getFisheryRegion(getTopiaContext()); return result; } catch (StorageException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get fishery region", eee); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/ZoneImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/ZoneImpl.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/ZoneImpl.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -51,7 +51,7 @@ .getFisheryRegion(getTopiaContext()); return result; } catch (StorageException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get fishery region", eee); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -140,9 +140,9 @@ if (log.isDebugEnabled()) { log.debug(_("isisfish.log.addAppender", appenderId)); } - } catch (IOException e) { - log.error(_("isisfish.error.log.createAppender", appenderId, e.getMessage())); - throw new IsisFishException(e); + } catch (IOException ex) { + log.error(_("isisfish.error.log.createAppender", appenderId, ex.getMessage())); + throw new IsisFishException("Can't add appender", ex); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -196,11 +196,11 @@ return out.toString(); } catch (IOException e) { - throw new IsisFishRuntimeException(e); + throw new IsisFishRuntimeException("Can't format xml", e); } catch (ParserConfigurationException e) { - throw new IllegalArgumentException(e); + throw new IllegalArgumentException("Can't format xml", e); } catch (SAXException e) { - throw new IllegalArgumentException(e); + throw new IllegalArgumentException("Can't format xml", e); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -973,8 +973,8 @@ FileUtil.copy(sourceFile, dst); } } - } catch (Exception ee) { - throw new IsisFishRuntimeException(ee); + } catch (Exception ex) { + throw new IsisFishRuntimeException("Can't backup scripts", ex); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/BackupAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/BackupAction.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/BackupAction.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -97,8 +97,8 @@ for (String path : paths) { backup(new File(src, path), path, suffix); } - } catch (Exception ee) { - throw new IsisFishRuntimeException(ee); + } catch (Exception ex) { + throw new IsisFishRuntimeException("Can't backup scripts", ex); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ExportAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ExportAction.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ExportAction.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -153,8 +153,8 @@ + " files] (size " + dst.length() + ")"); } - } catch (IOException e1) { - throw new IsisFishRuntimeException(e1); + } catch (IOException ex) { + throw new IsisFishRuntimeException("Can't export script", ex); } } } \ No newline at end of file
participants (1)
-
chatellier＠users.labs.libre-entreprise.org