- Isis-fish-commits - mailman.cloud.codelutin.com

r4049 - branches/4.3.0-log4j2/src/main/resources
by echatellier＠users.forge.codelutin.com 20 Jul '14

20 Jul '14

Author: echatellier Date: 2014-07-20 22:26:44 +0200 (Sun, 20 Jul 2014) New Revision: 4049 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4049 Log: Switch to log4j2 (testing) Added: branches/4.3.0-log4j2/src/main/resources/log4j2.xml Added: branches/4.3.0-log4j2/src/main/resources/log4j2.xml =================================================================== (Binary files differ) Property changes on: branches/4.3.0-log4j2/src/main/resources/log4j2.xml ___________________________________________________________________ Added: svn:mime-type + application/xml

1 0

r4048 - in branches: . 4.3.0-log4j2 4.3.0-log4j2/src/main/java/fr/ifremer/isisfish 4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore 4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/entities 4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging 4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/launcher 4.3.0-log4j2/src/test/java/fr/ifremer/isisfish/logging
by echatellier＠users.forge.codelutin.com 20 Jul '14

20 Jul '14

Author: echatellier Date: 2014-07-20 22:25:48 +0200 (Sun, 20 Jul 2014) New Revision: 4048 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4048 Log: Switch to log4j2 (testing) Added: branches/4.3.0-log4j2/ Modified: branches/4.3.0-log4j2/pom.xml branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/IsisConfig.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/IsisFish.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/ThreadFilter.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java branches/4.3.0-log4j2/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java Property changes on: branches/4.3.0-log4j2 ___________________________________________________________________ Added: svn:ignore + maven.log target velocity.log .classpath .project isis-fish.ipr isis-fish.iws isis-fish.iml .settings bin nbproject Inputs_Langoustine .idea Added: svn:mergeinfo + /branches/4.0.0-svnkit:3665-3698 /branches/4.0.1:3616-3968 /branches/4.1:3601-3670 Modified: branches/4.3.0-log4j2/pom.xml =================================================================== --- trunk/pom.xml 2014-07-19 13:52:09 UTC (rev 4047) +++ branches/4.3.0-log4j2/pom.xml 2014-07-20 20:25:48 UTC (rev 4048) @@ -213,29 +213,37 @@ </dependency> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.7.7</version> + <scope>runtime</scope> + </dependency> + + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> + <version>1.2</version> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.17</version> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>2.0</version> <scope>compile</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>1.7.7</version> - <scope>runtime</scope> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> + <version>2.0</version> + <scope>runtime</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.7.7</version> - <scope>runtime</scope> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <version>2.0</version> + <scope>runtime</scope> </dependency> <dependency> Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2014-07-19 13:52:09 UTC (rev 4047) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2014-07-20 20:25:48 UTC (rev 4048) @@ -1000,10 +1000,10 @@ } /** - * Seuil d'uitilisation des matrices creuse + * Seuil d'utilisation des matrices creuse * * @return - * @since 4.2.0.2 + * @since 4.3.1.0 */ public int getSimulationMatrixThresholdUseSparse() { ApplicationConfig config = SimulationContext.get().getConfig(); @@ -1012,7 +1012,7 @@ } /** - * Seuil d'uitilisation des matrices creuse + * Seuil d'utilisation des matrices creuse * * @return * @since 4.3.1.0 @@ -1028,7 +1028,7 @@ * de temps. * * @return - * @since 4.2.0.2 + * @since 4.3.1.0 */ public int getSimulationStoreResultOnDisk() { ApplicationConfig config = SimulationContext.get().getConfig(); @@ -1040,7 +1040,7 @@ * Indique le nombre de pas qui doivent rester en memoire durant la simulation * * @return - * @since 4.2.0.2 + * @since 4.3.1.0 */ public int getSimulationStoreResultCacheStep() { ApplicationConfig config = SimulationContext.get().getConfig(); Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2014-07-19 13:52:09 UTC (rev 4047) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/IsisFish.java 2014-07-20 20:25:48 UTC (rev 4048) @@ -121,6 +121,9 @@ public static void main(String... args) throws Exception { + // TODO as of 20140720, hibernate fails to detect log4j 2.0, force slf4j + System.setProperty("org.jboss.logging.provider", "slf4j"); + // permet de faire fonctionner la compilation en webstart System.setSecurityManager(null); Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2014-07-19 13:52:09 UTC (rev 4047) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2014-07-20 20:25:48 UTC (rev 4048) @@ -41,6 +41,7 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.ThreadContext; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.util.FileUtil; @@ -880,7 +881,7 @@ public void addSimulationLogger(String simulLogLevel, String scriptLogLevel, String libLogLevel, String threadName) { - try { + /*try { SimulationLoggerUtil.addSimulationAppender(getSimulationLogFile(), getAppenderId(), simulLogLevel, scriptLogLevel, libLogLevel, threadName); @@ -889,7 +890,13 @@ useLog = false; log.warn(t("Can't create simulation logger", eee)); // we do not throw any exception, this is a shame but not required - } + }*/ + + ThreadContext.put("contextId", name); + ThreadContext.put("contextLogFile", getSimulationLogFile()); + ThreadContext.put("contextSimulLevel", simulLogLevel); + ThreadContext.put("contextScriptLevel", scriptLogLevel); + ThreadContext.put("contextLibLevel", libLogLevel); } /** @@ -897,12 +904,12 @@ */ public void removeSimulationLogger() { - try { + /*try { String appenderId = getAppenderId(); SimulationLoggerUtil.removeSimulationAppender(appenderId); } finally { useLog = false; - } + }*/ } /** Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java 2014-07-19 13:52:09 UTC (rev 4047) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java 2014-07-20 20:25:48 UTC (rev 4048) @@ -74,7 +74,7 @@ public List<Metier> getMetierWithProportion() { MatrixND mat = super.getProportionMetier(); List<Metier> result = new ArrayList<Metier>(mat.getDim(0)); - for (MatrixIterator i=mat.iteratorNotZero(); i.next();) { + for (MatrixIterator i = mat.iteratorNotZero(); i.next();) { result.add((Metier)i.getSemanticsCoordinates()[0]); } return result; Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java 2014-07-19 13:52:09 UTC (rev 4047) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java 2014-07-20 20:25:48 UTC (rev 4048) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, Benjamin Poussin, Tony Chemit + * Copyright (C) 2002 - 2014 Ifremer, Code Lutin, Benjamin Poussin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -25,17 +25,6 @@ package fr.ifremer.isisfish.logging; -import fr.ifremer.isisfish.IsisFish; -import fr.ifremer.isisfish.IsisFishException; -import fr.ifremer.isisfish.datastore.SimulationStorage; -import fr.ifremer.isisfish.logging.console.LogConsole; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.log4j.Appender; -import org.apache.log4j.FileAppender; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; -import org.apache.log4j.PatternLayout; import static org.nuiton.i18n.I18n.t; import java.io.File; @@ -44,6 +33,23 @@ import java.util.HashMap; import java.util.Map; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.core.Appender; +import org.apache.logging.log4j.core.LoggerContext; +import org.apache.logging.log4j.core.appender.FileAppender; +import org.apache.logging.log4j.core.config.Configuration; +import org.apache.logging.log4j.core.config.DefaultConfiguration; +import org.apache.logging.log4j.core.layout.PatternLayout; + +import fr.ifremer.isisfish.IsisFish; +import fr.ifremer.isisfish.IsisFishException; +import fr.ifremer.isisfish.datastore.SimulationStorage; +import fr.ifremer.isisfish.logging.console.LogConsole; + /** * FIXME poussin, a priori cette classe ne supporte pas plusieurs simulation * en meme temps, ce qui est le cas si on a plusieurs processeurs de dispo :( @@ -115,8 +121,9 @@ String libLogLevel, String threadName) throws IsisFishException { - PatternLayout layout = new PatternLayout(); - layout.setConversionPattern(LOG_PATTERN); + PatternLayout layout = PatternLayout.newBuilder() + .withPattern(LOG_PATTERN) + .build(); ThreadFilter filter = new ThreadFilter(threadName); @@ -124,25 +131,43 @@ scriptLevelKeeper = prepareLogger(scriptLogLevel, scriptLoggerToChange); libLevelKeeper = prepareLogger(libLogLevel, libLoggerToChange); - //TODO See if we use should use the buffered version : define buffer size + Configuration configuration = new DefaultConfiguration(); + //try { + //FileAppender appender = new FileAppender(layout, filename, false); + FileAppender appender = FileAppender.createAppender(filename, + "false" /*append*/, + "false" /*locking*/, + threadName /*name*/, + "true" /*immediateFlush*/, + "true" /*ignore*/, + "true" /*bufferedIo*/, + "8192" /*bufferSizeStr*/, + layout, + filter, + "false" /*advertise*/, + threadName /*advertiseUri*/, + configuration); + + //appender.setName(appenderId); - try { - FileAppender appender = new FileAppender(layout, filename, false); - appender.setName(appenderId); - // thread filter come first - appender.addFilter(filter); + //appender.addFilter(filter); // add the appender to the root appender - Logger.getRootLogger().addAppender(appender); + //Logger.getRootLogger().addAppender(appender); + configuration.addAppender(appender); + LoggerContext context = (LoggerContext) LogManager.getContext(); + context.start(configuration); + context.updateLoggers(); + if (log.isDebugEnabled()) { log.debug(t("isisfish.log.addAppender", appenderId)); } - } catch (IOException ex) { + /*} catch (IOException ex) { log.error(t("isisfish.error.log.createAppender", appenderId, ex.getMessage())); throw new IsisFishException("Can't add appender", ex); - } + }*/ } @@ -203,7 +228,7 @@ */ static Map<String, Level> prepareLogger(String logLevel, String[] categoriesToChange) { Map<String, Level> result = new HashMap<String, Level>(); - Enumeration enumeration; + /*Enumeration enumeration; Level level = Level.toLevel(logLevel); @@ -226,7 +251,7 @@ } } } - } + }*/ return result; } @@ -236,7 +261,7 @@ * @param levelKeeper the dico of categories to swap back to original levels */ static void retablishLogger(Map<String, Level> levelKeeper) { - Logger rootLogger = Logger.getRootLogger(); + /*Logger rootLogger = Logger.getRootLogger(); for (Map.Entry<String, Level> entry : levelKeeper.entrySet()) { Logger logger = rootLogger.getLoggerRepository().getLogger(entry.getKey()); if (logger != null) { @@ -247,7 +272,7 @@ logger.setLevel(oldLevel); } } - levelKeeper.clear(); + levelKeeper.clear();*/ } /** @@ -260,7 +285,7 @@ */ static void removeAppender(String category, String name) { // get logger for the category - Logger logger = category == null ? Logger.getRootLogger() : Logger.getLogger(category); + /*Logger logger = category == null ? Logger.getRootLogger() : Logger.getLogger(category); if (logger == null) { Logger.getRootLogger().warn(t("isisfish.error.log.closeAppender", name, category)); return; @@ -275,6 +300,6 @@ // close appender app.close(); // and remove it from the logger - logger.removeAppender(app); + logger.removeAppender(app);*/ } } Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/ThreadFilter.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/logging/ThreadFilter.java 2014-07-19 13:52:09 UTC (rev 4047) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/ThreadFilter.java 2014-07-20 20:25:48 UTC (rev 4048) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, Benjamin Poussin, Tony Chemit + * Copyright (C) 2002 - 2014 Ifremer, Code Lutin, Benjamin Poussin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -25,27 +25,45 @@ package fr.ifremer.isisfish.logging; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.Marker; +import org.apache.logging.log4j.core.LogEvent; +import org.apache.logging.log4j.core.Logger; +import org.apache.logging.log4j.core.filter.AbstractFilter; +import org.apache.logging.log4j.message.Message; + /** * this class is Log4J filter to accept only incoming log events from a unique thread. * it retains all logEvent coming from other threads (compare with given thread name). * * @author chemit */ -public class ThreadFilter extends org.apache.log4j.spi.Filter { +public class ThreadFilter extends AbstractFilter { /** the name of the only thread to accept */ protected String threadName; public ThreadFilter(String threadName) { - this.threadName=threadName; + this.threadName = threadName; } - public int decide(org.apache.log4j.spi.LoggingEvent event) { - // only accept event coming from a specific thread - return event.getThreadName().equals(threadName) ? ACCEPT : DENY; + @Override + public Result filter(LogEvent event) { + return event.getThreadName().equals(threadName) ? Result.ACCEPT : Result.DENY; } - - public void setThreadName(String threadName) { - this.threadName = threadName; + + @Override + public Result filter(Logger logger, Level level, Marker marker, Message msg, Throwable t) { + throw new UnsupportedOperationException("filter"); } + + @Override + public Result filter(Logger logger, Level level, Marker marker, Object msg, Throwable t) { + throw new UnsupportedOperationException("filter"); + } + + @Override + public Result filter(Logger logger, Level level, Marker marker, String msg, Object... params) { + throw new UnsupportedOperationException("filter"); + } } Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2014-07-19 13:52:09 UTC (rev 4047) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2014-07-20 20:25:48 UTC (rev 4048) @@ -227,14 +227,14 @@ String simulLogLevel = simulation.getParameter().getSimulLogLevel(); String scriptLogLevel = simulation.getParameter().getScriptLogLevel(); String libLogLevel = simulation.getParameter().getLibLogLevel(); - try { + /*try { simulation.addSimulationLogger(simulLogLevel, scriptLogLevel, libLogLevel, simThread.getName()); } catch (Exception e) { if (log.isWarnEnabled()) { log.warn(t("isisfish.error.add.logger.simulation", e)); } - } + }*/ try { simThread.start(); try { @@ -263,6 +263,13 @@ @Override public void run() { + + String simulLogLevel = simulation.getParameter().getSimulLogLevel(); + String scriptLogLevel = simulation.getParameter().getScriptLogLevel(); + String libLogLevel = simulation.getParameter().getLibLogLevel(); + simulation.addSimulationLogger(simulLogLevel, scriptLogLevel, + libLogLevel, getName()); + simulation = localSimulateSameThread(control, simulation); } } Modified: branches/4.3.0-log4j2/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java 2014-07-19 13:52:09 UTC (rev 4047) +++ branches/4.3.0-log4j2/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java 2014-07-20 20:25:48 UTC (rev 4048) @@ -32,8 +32,9 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.junit.Assert; import org.junit.Test; @@ -63,7 +64,7 @@ String threadName = Thread.currentThread().getName(); // use a logger we know to be scan as been keep for original level - Logger hibernatelog = Logger.getLogger("org.hibernate"); + Logger hibernatelog = LogManager.getLogger("org.hibernate"); Level hibernateLogLevel = hibernatelog.getLevel(); @@ -82,7 +83,7 @@ ); // check hibernate level was not changed - Assert.assertEquals(hibernateLogLevel, Logger.getLogger("org.hibernate").getLevel()); + Assert.assertEquals(hibernateLogLevel, LogManager.getLogger("org.hibernate").getLevel()); final Log logger = LogFactory.getLog(appenderId); @@ -168,7 +169,7 @@ String threadName = Thread.currentThread().getName(); // use a logger we know to be scan as been keep for original level - Logger hibernatelog = Logger.getLogger("org.hibernate"); + Logger hibernatelog = LogManager.getLogger("org.hibernate"); Level hibernateLogLevel = hibernatelog.getLevel(); @@ -185,7 +186,7 @@ ); // check hibernate level was not changed - Assert.assertEquals(hibernateLogLevel, Logger.getLogger("org.hibernate").getLevel()); + Assert.assertEquals(hibernateLogLevel, LogManager.getLogger("org.hibernate").getLevel()); final Log logger = LogFactory.getLog(appenderId);

1 0

r4047 - trunk
by echatellier＠users.forge.codelutin.com 19 Jul '14

19 Jul '14

Author: echatellier Date: 2014-07-19 15:52:09 +0200 (Sat, 19 Jul 2014) New Revision: 4047 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4047 Log: Update hibernate Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-07-19 10:44:45 UTC (rev 4046) +++ trunk/pom.xml 2014-07-19 13:52:09 UTC (rev 4047) @@ -484,7 +484,7 @@ <jaxxVersion>2.8.7</jaxxVersion> <eugeneVersion>2.7.4</eugeneVersion> <topiaVersion>2.9.1</topiaVersion> - <hibernateVersion>4.3.5.Final</hibernateVersion> + <hibernateVersion>4.3.6.Final</hibernateVersion> <nuitonI18nVersion>3.1</nuitonI18nVersion> <nuitonWidgetsVersion>1.1.1</nuitonWidgetsVersion>

1 0

r4046 - trunk/src/main/resources/i18n
by echatellier＠users.forge.codelutin.com 19 Jul '14

19 Jul '14

Author: echatellier Date: 2014-07-19 12:44:45 +0200 (Sat, 19 Jul 2014) New Revision: 4046 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4046 Log: Readd "Zones" Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties trunk/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2014-07-19 10:37:46 UTC (rev 4045) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2014-07-19 10:44:45 UTC (rev 4046) @@ -531,7 +531,7 @@ isisfish.input.tree.strategies=Strategies isisfish.input.tree.triptypes=Trip types isisfish.input.tree.vesseltypes=Vessel types -isisfish.input.tree.zones= +isisfish.input.tree.zones=Zones isisfish.launch.anonymous=read only isisfish.launch.email=email isisfish.launch.firstname=firstname @@ -729,7 +729,7 @@ isisfish.population.recruitment=Recruitment isisfish.population.reproduction=Reproduction isisfish.population.season=Season -isisfish.population.zones= +isisfish.population.zones=Zones isisfish.populationBasics.confirmCreateGroups=Warning, running groups creation wizard will delete all existing groups and objects which depend on it.\nDo you want to re-create groups ? isisfish.populationBasics.geographicID=Geographic identifier isisfish.populationBasics.groupMax=Max group @@ -808,7 +808,7 @@ isisfish.populationZones.selectPopulationAreas=Select the population areas isisfish.populationZones.selectRecruitmentAreas=Select the recruitment areas isisfish.populationZones.selectSpawningAreas=Select the spawning areas -isisfish.populationZones.title= +isisfish.populationZones.title=Zones isisfish.port.cell=Port cell isisfish.port.comments=Comments isisfish.port.name=Name Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-07-19 10:37:46 UTC (rev 4045) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-07-19 10:44:45 UTC (rev 4046) @@ -531,7 +531,7 @@ isisfish.input.tree.strategies=Stratégies isisfish.input.tree.triptypes=Types de marée isisfish.input.tree.vesseltypes=Types de navire -isisfish.input.tree.zones= +isisfish.input.tree.zones=Zones isisfish.launch.anonymous=lecture seule isisfish.launch.email=courriel isisfish.launch.firstname=nom @@ -724,7 +724,7 @@ isisfish.population.recruitment=Recrutement isisfish.population.reproduction=Reproduction isisfish.population.season=Saison -isisfish.population.zones= +isisfish.population.zones=Zones isisfish.populationBasics.confirmCreateGroups=Attention, la re-création des groupes supprimera les groupes existants et tous les objets qui en dépendent.\nÊtes vous sur de vouloir re-créer les groupes ? isisfish.populationBasics.geographicID=Identifiant géographique isisfish.populationBasics.groupMax=Group max @@ -803,7 +803,7 @@ isisfish.populationZones.selectPopulationAreas=Sélectionnez les zones des populations isisfish.populationZones.selectRecruitmentAreas=Sélectionnez les zones de recrutement isisfish.populationZones.selectSpawningAreas=Sélectionnez les zones de reproduction -isisfish.populationZones.title= +isisfish.populationZones.title=Zones isisfish.port.cell=Maille du port isisfish.port.comments=Commentaires isisfish.port.name=Nom

1 0

r4045 - trunk/src/main/java/fr/ifremer/isisfish/aspect
by echatellier＠users.forge.codelutin.com 19 Jul '14

19 Jul '14

Author: echatellier Date: 2014-07-19 12:37:46 +0200 (Sat, 19 Jul 2014) New Revision: 4045 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4045 Log: Ajout de doc. Retrait de code comment?\195?\169. Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/AspectJWeavingAdaptor.java trunk/src/main/java/fr/ifremer/isisfish/aspect/CacheAspect.java trunk/src/main/java/fr/ifremer/isisfish/aspect/RuleAspect.java trunk/src/main/java/fr/ifremer/isisfish/aspect/TraceAspect.java trunk/src/main/java/fr/ifremer/isisfish/aspect/package-info.java Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/AspectJWeavingAdaptor.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/aspect/AspectJWeavingAdaptor.java 2014-07-19 10:11:28 UTC (rev 4044) +++ trunk/src/main/java/fr/ifremer/isisfish/aspect/AspectJWeavingAdaptor.java 2014-07-19 10:37:46 UTC (rev 4045) @@ -167,7 +167,13 @@ public void prepare() { weaver.prepareForWeave(); } - + + /** + * Cliper/coller de la classe originale {@code WeavingClassFileProvider} car elle n'est pas visible (private). + * + * L'appel à {@code delegateForCurrentClass.getResolvedTypeX().getName()} a été désactivé car c'est quelque chose + * qui est valorisé par l'instrospecteur d'aspect qui n'est pas défini pour IsisFish (aspect runtime). + */ private class WeavingClassFileProvider2 implements IClassFileProvider { private final UnwovenClassFile unwovenClass; Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/CacheAspect.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/aspect/CacheAspect.java 2014-07-19 10:11:28 UTC (rev 4044) +++ trunk/src/main/java/fr/ifremer/isisfish/aspect/CacheAspect.java 2014-07-19 10:37:46 UTC (rev 4045) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2006 - 2013 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * Copyright (C) 2006 - 2014 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -55,12 +55,6 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(CacheAspect.class); - //@Expression("execution(* scripts..*(..))") - //Pointcut scriptsMethod; - - public CacheAspect() { - } - /** * Return trace object from context. * @@ -85,7 +79,4 @@ } return result; } - } - - Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/RuleAspect.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/aspect/RuleAspect.java 2014-07-19 10:11:28 UTC (rev 4044) +++ trunk/src/main/java/fr/ifremer/isisfish/aspect/RuleAspect.java 2014-07-19 10:37:46 UTC (rev 4045) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 1999 - 2010 Ifremer, Code Lutin + * Copyright (C) 1999 - 2014 Ifremer, Code Lutin, 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 @@ -40,9 +40,9 @@ import fr.ifremer.isisfish.types.TimeStep; /** - * Aspect utiliser pour intersepecter les appels a + * Aspect utilisé pour intersepecter les appels a * {@link Rule#init(SimulationContext)}, {@link Rule#preAction(SimulationContext, TimeStep, Metier)}, - * {@link Rule#postAction(SimulationContext, TimeStep, Metier)} et memoriser + * {@link Rule#postAction(SimulationContext, TimeStep, Metier)} et mémoriser * le temps mit. * * @author chatellier @@ -106,6 +106,7 @@ * @param jp join point * @param state state * @throws Throwable + * @return target joint point method result */ protected Object makeTimedCall(ProceedingJoinPoint jp, int state) throws Throwable { @@ -168,8 +169,7 @@ default: break; } - } - else { + } else { if (log.isWarnEnabled()) { log.warn("Time register called outside a simulation context"); } Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/TraceAspect.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/aspect/TraceAspect.java 2014-07-19 10:11:28 UTC (rev 4044) +++ trunk/src/main/java/fr/ifremer/isisfish/aspect/TraceAspect.java 2014-07-19 10:37:46 UTC (rev 4045) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2006 - 2011 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, Chatellier Eric + * Copyright (C) 2006 - 2014 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 @@ -36,7 +36,6 @@ import fr.ifremer.isisfish.simulator.SimulationContext; import org.nuiton.profiling.Trace; -//import fr.ifremer.isisfish.util.Trace; /** * Permet de tracer les appels aux methodes utilisateur ainsi que l'execution @@ -55,16 +54,6 @@ @Aspect public class TraceAspect { - /*@Pointcut("execution(* scripts..*(..))" - + " || execution(* simulators..*(..))" - + " || execution(* rules..*(..)) " - + " || execution(* simulationplans..*(..)) " - + " || execution(* formules..*(..))") - Pointcut executeMethod;*/ - - public TraceAspect() { - } - /** * Return trace object from context. * Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/package-info.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/aspect/package-info.java 2014-07-19 10:11:28 UTC (rev 4044) +++ trunk/src/main/java/fr/ifremer/isisfish/aspect/package-info.java 2014-07-19 10:37:46 UTC (rev 4045) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 1999 - 2013 Ifremer, CodeLutin, Chatellier Eric + * Copyright (C) 1999 - 2014 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 @@ -33,4 +33,3 @@ * </ul> */ package fr.ifremer.isisfish.aspect; -

1 0

r4044 - trunk/src/main/java/fr/ifremer/isisfish/aspect
by echatellier＠users.forge.codelutin.com 19 Jul '14

19 Jul '14

Author: echatellier Date: 2014-07-19 12:11:28 +0200 (Sat, 19 Jul 2014) New Revision: 4044 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4044 Log: Ajout de commentaire sur les aspects aspectj Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/AspectJUrlClassLoader.java trunk/src/main/java/fr/ifremer/isisfish/aspect/AspectJWeavingAdaptor.java Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/AspectJUrlClassLoader.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/aspect/AspectJUrlClassLoader.java 2014-07-19 08:52:22 UTC (rev 4043) +++ trunk/src/main/java/fr/ifremer/isisfish/aspect/AspectJUrlClassLoader.java 2014-07-19 10:11:28 UTC (rev 4044) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 Ifremer, Code Lutin, Chatellier Eric + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin, 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 @@ -37,6 +37,18 @@ import org.aspectj.weaver.tools.TraceFactory; import org.aspectj.weaver.tools.WeavingClassLoader; +/** + * Cette classe est un copié/coller de {@link org.aspectj.weaver.loadtime.WeavingURLClassLoader} qui permet de définit + * notre propre instance de {@code adaptor} pour, dans le cas d'IsisFish, permettre d'ajouter des aspects à l'execution. + * + * Elle définie deux nouvelles méthodes: + * <ul> + * <li>{@link #deploy(Class)} : qui permet de deployer un nouvel aspect<li> + * <li>{@link #prepare()} : à appeler après l'ajout de tous les aspects dynamiques</li> + * </ul> + * + * @since 4.2.0.0 + */ public class AspectJUrlClassLoader extends ExtensibleURLClassLoader implements WeavingClassLoader { public static final String WEAVING_CLASS_PATH = "aj.class.path"; Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/AspectJWeavingAdaptor.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/aspect/AspectJWeavingAdaptor.java 2014-07-19 08:52:22 UTC (rev 4043) +++ trunk/src/main/java/fr/ifremer/isisfish/aspect/AspectJWeavingAdaptor.java 2014-07-19 10:11:28 UTC (rev 4044) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 Ifremer, Code Lutin, Chatellier Eric + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin, 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 @@ -33,6 +33,7 @@ import java.util.Iterator; import java.util.List; +import org.apache.commons.io.IOUtils; import org.aspectj.apache.bcel.classfile.ClassParser; import org.aspectj.apache.bcel.classfile.JavaClass; import org.aspectj.bridge.IMessageHandler; @@ -52,6 +53,24 @@ import org.aspectj.weaver.tools.cache.SimpleCache; import org.aspectj.weaver.tools.cache.SimpleCacheFactory; +/** + * Cette classe étend {@link WeavingAdaptor} pour avoir une instance personnalisée du champ {@link #weaver}. + * + * Toutes la logique consiste ensuite à pouvoir appeler le code {@code weaver.weave(wcp);} pour pouvoir déployer un + * apect à l'execution dans le {@code weaver} qui servira ensuite à "aspectiser une classe" via la méthode + * {@link #weaveClass(String, byte[])}. + * + * Elle utilise pour l'instant de l'introspection agressive pour acceder aux attributs privés de la classe parentes et + * les rendre visible. + * + * TODO : au lieu d'ajouter à la demande des aspects, on pourrait les ajouters en parmanence, mais en les activant de + * facon conditionnelle (if() cutpoint). + * A tester. Il est possible que sans le cas d'isis, une classe non aspectisée soit plus performante qu'une classe + * dont les aspects ne sont pas activés. + * Voir la discussion : http://aspectj.2085585.n4.nabble.com/Runtime-weaving-without-agent-tp465083… + * + * @since 4.2.0.0 + */ public class AspectJWeavingAdaptor extends WeavingAdaptor { protected ClassLoader parentLoader; @@ -115,9 +134,10 @@ public byte[] deploy(Class<?> aspectClass) { byte[] result = null; + InputStream is = null; try { String name = aspectClass.getName(); - InputStream is = AspectJWeavingAdaptor.class.getResourceAsStream("/" + name.replace('.', '/') + ".class"); + is = AspectJWeavingAdaptor.class.getResourceAsStream("/" + name.replace('.', '/') + ".class"); byte[] bytes = FileUtil.readAsByteArray(is); is.close(); ClassParser parser = new ClassParser(new ByteArrayInputStream(bytes), name); @@ -134,6 +154,8 @@ } catch (IOException e) { throw new RuntimeException("Can't create aspect", e); + } finally { + IOUtils.closeQuietly(is); } return result;

1 0

r4043 - branches
by echatellier＠users.forge.codelutin.com 19 Jul '14

19 Jul '14

Author: echatellier Date: 2014-07-19 10:52:22 +0200 (Sat, 19 Jul 2014) New Revision: 4043 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4043 Log: Remove unused branches Removed: branches/3.0.20/ branches/3.1.3/ branches/3.1.4/ branches/3.2.0.5.x/ branches/3.2.1/ branches/3.3.0.4-disworksupport/ branches/3.3.1/ branches/4.0.0-svnkit/ branches/4.0.1/ branches/4.1/ branches/arbo-maven/ branches/codelutin/ branches/isis-fish-3.2.0.8/ branches/isis-fish-3.3.0.x/ branches/maven2_multimodule/ branches/multi-thread-worker/ branches/svn/

1 0

r4042 - trunk/src/main/java/fr/ifremer/isisfish/util
by bpoussin＠users.forge.codelutin.com 18 Jul '14

18 Jul '14

Author: bpoussin Date: 2014-07-18 20:20:13 +0200 (Fri, 18 Jul 2014) New Revision: 4042 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4042 Log: default to 1.3 to resize cache (before 3) Modified: trunk/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnGuava.java Modified: trunk/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnGuava.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnGuava.java 2014-07-17 17:27:13 UTC (rev 4041) +++ trunk/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnGuava.java 2014-07-18 18:20:13 UTC (rev 4042) @@ -59,7 +59,7 @@ /** number of time steps to cache by interpolating from the first step*/ // perhaps allow the configuration - static public int CACHE_STEP = 3; + static public double CACHE_STEP = 1.3; // between 2 step, cache size is very close: 1.3 seem correct static public class IsisCacheBackendOnGuavaFactory implements IsisCacheBackend.Factory { @Override @@ -256,7 +256,7 @@ // after first step, use information to resize cache if (!adjusted) { - adjustedCache(stepAmount * CACHE_STEP); // keep place for 3 step + adjustedCache((long)(stepAmount * CACHE_STEP)); // keep place for 1.3 step adjusted = true; } }

1 0

r4041 - in trunk/src/main: java/fr/ifremer/isisfish/simulator java/fr/ifremer/isisfish/simulator/launcher resources/i18n
by bpoussin＠users.forge.codelutin.com 17 Jul '14

17 Jul '14

Author: bpoussin Date: 2014-07-17 19:27:13 +0200 (Thu, 17 Jul 2014) New Revision: 4041 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4041 Log: add remaining time in progress bar Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java trunk/src/main/resources/i18n/isis-fish_en_GB.properties trunk/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java 2014-07-17 16:04:09 UTC (rev 4040) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java 2014-07-17 17:27:13 UTC (rev 4041) @@ -44,11 +44,12 @@ import fr.ifremer.isisfish.util.IsisCache; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -//import fr.ifremer.isisfish.util.Trace; import org.nuiton.config.ApplicationConfig; import org.nuiton.config.OverwriteApplicationConfig; import org.nuiton.math.matrix.MatrixFactory; +import org.nuiton.profiling.Statistic; import org.nuiton.profiling.Trace; +import org.nuiton.profiling.Unit; /** * Keep all information on one simulation. @@ -87,10 +88,40 @@ protected PropertyChangeListener stepListener = new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - SimulationContext.this.fireStepChange(new TimeStep((Integer)evt.getNewValue())); + Integer i = (Integer)evt.getNewValue(); + SimulationContext.this.fireStepChange(new TimeStep(i)); + + // met a jour les stats sur le temps des pas de temps + Statistic stat = SimulationContext.this.timeStepStat; + stat.add(i); + SimulationContext.this.getSimulationControl().setTimeStepMeanTime( + Unit.Time.nano.convertTo(Unit.Time.s, stat.getMean())); } }; + protected Statistic timeStepStat = new Statistic("Step time"){ + protected long lastTime = 0; + // add delta not value + @Override + public void add(long value) { + if (lastTime == 0) { + lastTime = System.nanoTime(); + } else { + long newTime = System.nanoTime(); + long delta = newTime - lastTime; + lastTime = newTime; + super.add(delta); + } + + } + + @Override + public String formatValue(long value) { + String result = String.valueOf(Unit.Time.nano.convertTo(Unit.Time.s, value)); + return result; + } + }; + protected ClassLoader classLoader = null; protected File scriptDirectory; /** l'objet trace qui conserve les donnees statistiques des appels de methodes */ @@ -311,6 +342,10 @@ this.simulation = simulation; } + public Statistic getTimeStepStat() { + return timeStepStat; + } + /** * @return Returns the simulationControl. */ Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java 2014-07-17 16:04:09 UTC (rev 4040) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java 2014-07-17 17:27:13 UTC (rev 4041) @@ -65,6 +65,8 @@ protected long progressMax = 0; protected long progress = 0; protected String text = ""; + // temps moyen d'un pas de temps vaut 0 tant que pas mis a jour + protected double timeStepMeanTime; /** Control save mecanism each time a property is changed (default to false). */ protected transient boolean autoSaveState = false; @@ -303,6 +305,25 @@ } /** + * Set mean time for one step in second + * @param timeStepMeanTime + */ + public void setTimeStepMeanTime(double timeStepMeanTime) { + double oldValue = this.timeStepMeanTime; + this.timeStepMeanTime = timeStepMeanTime; + listeners.firePropertyChange("timeStepMeanTime", oldValue, this.timeStepMeanTime); + } + + /** + * Get mean time for one step in second + * @return + */ + public double getTimeStepMeanTime() { + return timeStepMeanTime; + } + + + /** * Met dans un Properties tous les champs * @return un Properties avec tous les champs */ @@ -318,6 +339,7 @@ result.setProperty("progressMax", String.valueOf(progressMax)); result.setProperty("progress", String.valueOf(progress)); result.setProperty("text", text); + result.setProperty("timeStepMeanTime", String.valueOf(timeStepMeanTime)); return result; } @@ -371,6 +393,10 @@ String text = props.getProperty("text"); setText(text); } + if (props.containsKey("timeStepMeanTime")) { + double timeStepMeanTime = Double.parseDouble(props.getProperty("timeStepMeanTime")); + setTimeStepMeanTime(timeStepMeanTime); + } } finally { inUpdateFromProperties = false; } Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2014-07-17 16:04:09 UTC (rev 4040) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2014-07-17 17:27:13 UTC (rev 4041) @@ -71,8 +71,6 @@ import fr.ifremer.isisfish.types.TimeStep; import fr.ifremer.isisfish.util.CompileHelper; import org.nuiton.math.matrix.MatrixFactory; -import org.nuiton.profiling.Statistic; -import org.nuiton.profiling.Unit; /** * Fait une simulation dans la meme jvm. @@ -89,46 +87,8 @@ private static Log log = LogFactory .getLog(InProcessSimulatorLauncher.class); - protected static class StepTimeStat implements SimulationListener { - - protected long lastTime = 0; - protected Statistic stat = new Statistic("Step time"){ - @Override - public String formatValue(long value) { - String result = String.valueOf(Unit.Time.nano.convertTo(Unit.Time.s, value)); - return result; - } - }; - - public Statistic getStat() { - return stat; - } - - @Override - public void beforeSimulation(SimulationContext context) { - } - - @Override - public void stepChange(SimulationContext context, TimeStep step) { - if (lastTime == 0) { - lastTime = System.nanoTime(); - } else { - long newTime = System.nanoTime(); - long delta = newTime - lastTime; - lastTime = newTime; - stat.add(delta); - } - } - - @Override - public void afterSimulation(SimulationContext context) { - } - - } - protected SimulationStorage simulation; - protected StepTimeStat stepTimeStat = new StepTimeStat(); - + /** * {@inheritDoc} */ @@ -475,7 +435,7 @@ simulatorObject.simulate(context); simulation.getInformation().addInformation( - stepTimeStat.getStat().exportText(null).toString()); + context.getTimeStepStat().exportText(null).toString()); // // Ajout des nouveaux objets créés durant la simulation @@ -588,9 +548,6 @@ // - ResultStorage context.addSimulationListener(simulation.getResultStorage()); - // ajout du listener de statistique sur le temps de chaque pas de temps - context.addSimulationListener(stepTimeStat); - // - TODO: mexico xml result // - TODO: vle result String simListener = context.getSimulationStorage().getParameter() Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java 2014-07-17 16:04:09 UTC (rev 4040) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java 2014-07-17 17:27:13 UTC (rev 4041) @@ -43,6 +43,8 @@ import fr.ifremer.isisfish.simulator.SimulationControl; import fr.ifremer.isisfish.simulator.SimulationParameter; import fr.ifremer.isisfish.types.TimeStep; +import org.apache.commons.lang3.time.DurationFormatUtils; +import org.nuiton.profiling.Unit; /** * Model de table pour suivre l'evolution des differentes simulations en cours. @@ -266,13 +268,25 @@ break; case 4: JProgressBar pb = getProgressBar(job); - pb.setMaximum((int) control.getProgressMax()); - pb.setValue((int) control.getProgress()); + int value = (int) control.getProgress(); + int max = (int) control.getProgressMax(); + + String restTime = ""; + int rest = max - value; + double time = rest * control.getTimeStepMeanTime(); + if (time > 0) { + long milli = (long)Unit.Time.s.convertTo(Unit.Time.milli, time); + restTime = DurationFormatUtils.formatDurationHMS(milli); + } + + pb.setMaximum(max); + pb.setValue(value); + // progress can be used for other things TimeStep step = control.getStep(); if (step != null) { - pb.setString(step.getMonth() + "/" + step.getYear()); + pb.setString(step.getMonth() + "/" + step.getYear() + " ("+ restTime +")"); } else { pb.setString(""); @@ -329,6 +343,7 @@ setData(); } + @Override public void setData() { ArrayList<SimulationJob> jobs = new ArrayList<SimulationJob>(simulationService.getJobs()); for (SimulationJob job : jobs) { @@ -338,6 +353,7 @@ model.setJobs(jobs); } + @Override public void simulationStart(SimulationService simService, SimulationJob job) { model.addJob(job); @@ -345,6 +361,7 @@ model.controlListener); } + @Override public void simulationStop(SimulationService simService, SimulationJob job) { model.removeJob(job); @@ -352,6 +369,7 @@ model.controlListener); } + @Override public void clearJobDone(SimulationService simService) { // nothing to do } Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2014-07-17 16:04:09 UTC (rev 4040) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2014-07-17 17:27:13 UTC (rev 4041) @@ -531,7 +531,7 @@ isisfish.input.tree.strategies=Strategies isisfish.input.tree.triptypes=Trip types isisfish.input.tree.vesseltypes=Vessel types -isisfish.input.tree.zones=Zones +isisfish.input.tree.zones= isisfish.launch.anonymous=read only isisfish.launch.email=email isisfish.launch.firstname=firstname @@ -722,14 +722,14 @@ isisfish.population.capturability=Capturability isisfish.population.comments=Comments isisfish.population.group=Group -isisfish.population.groups=Groups +isisfish.population.groups= isisfish.population.mappingZoneReproZoneRecru=MappingZoneReproZoneRecru isisfish.population.matrixAbundance=Abundance matrix isisfish.population.matrixAbundance1D=matrixAbundance1D isisfish.population.recruitment=Recruitment isisfish.population.reproduction=Reproduction isisfish.population.season=Season -isisfish.population.zones=Zones +isisfish.population.zones= isisfish.populationBasics.confirmCreateGroups=Warning, running groups creation wizard will delete all existing groups and objects which depend on it.\nDo you want to re-create groups ? isisfish.populationBasics.geographicID=Geographic identifier isisfish.populationBasics.groupMax=Max group @@ -762,7 +762,7 @@ isisfish.populationGroup.naturalDeathRate=Natural death rate isisfish.populationGroup.price=Price isisfish.populationGroup.reproductionRate=Reproduction rate -isisfish.populationGroup.title=Groups +isisfish.populationGroup.title= isisfish.populationGroup.toString=%1$s Group %2$s isisfish.populationMigration.comments=Comments isisfish.populationMigration.selectSeason=Select a season @@ -808,7 +808,7 @@ isisfish.populationZones.selectPopulationAreas=Select the population areas isisfish.populationZones.selectRecruitmentAreas=Select the recruitment areas isisfish.populationZones.selectSpawningAreas=Select the spawning areas -isisfish.populationZones.title=Zones +isisfish.populationZones.title= isisfish.port.cell=Port cell isisfish.port.comments=Comments isisfish.port.name=Name Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-07-17 16:04:09 UTC (rev 4040) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-07-17 17:27:13 UTC (rev 4041) @@ -531,7 +531,7 @@ isisfish.input.tree.strategies=Stratégies isisfish.input.tree.triptypes=Types de marée isisfish.input.tree.vesseltypes=Types de navire -isisfish.input.tree.zones=Zones +isisfish.input.tree.zones= isisfish.launch.anonymous=lecture seule isisfish.launch.email=courriel isisfish.launch.firstname=nom @@ -724,7 +724,7 @@ isisfish.population.recruitment=Recrutement isisfish.population.reproduction=Reproduction isisfish.population.season=Saison -isisfish.population.zones=Zones +isisfish.population.zones= isisfish.populationBasics.confirmCreateGroups=Attention, la re-création des groupes supprimera les groupes existants et tous les objets qui en dépendent.\nÊtes vous sur de vouloir re-créer les groupes ? isisfish.populationBasics.geographicID=Identifiant géographique isisfish.populationBasics.groupMax=Group max @@ -803,7 +803,7 @@ isisfish.populationZones.selectPopulationAreas=Sélectionnez les zones des populations isisfish.populationZones.selectRecruitmentAreas=Sélectionnez les zones de recrutement isisfish.populationZones.selectSpawningAreas=Sélectionnez les zones de reproduction -isisfish.populationZones.title=Zones +isisfish.populationZones.title= isisfish.port.cell=Maille du port isisfish.port.comments=Commentaires isisfish.port.name=Nom

1 0

r4040 - in trunk/src/main: java/fr/ifremer/isisfish/datastore resources/i18n
by bpoussin＠users.forge.codelutin.com 17 Jul '14

17 Jul '14

Author: bpoussin Date: 2014-07-17 18:04:09 +0200 (Thu, 17 Jul 2014) New Revision: 4040 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4040 Log: better info message Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageCSV.java trunk/src/main/resources/i18n/isis-fish_en_GB.properties trunk/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageCSV.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageCSV.java 2014-07-16 20:45:26 UTC (rev 4039) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageCSV.java 2014-07-17 16:04:09 UTC (rev 4040) @@ -148,14 +148,20 @@ @Override public String getInfo() { + String oldest = ""; + if (maxGapWithCurrentStepReadOnDisk > 0) { + oldest = String.format("\tthe oldest step read on disk was %s step before current step\n", + maxGapWithCurrentStepReadOnDisk); + } + return String.format( "ResultStorageCSV:\n" + "\t%s results written to disk on a total of %s\n" + "\t%s results read (%s in cache and %s on disk)\n" - + "\tthe oldest step read on disk was %s step before current step\n", + + "%s", numberOfResultOnDisk, numberOfResult, numberOfResultAsked, numberOfResultReadInCache, numberOfResultReadOnDisk, - maxGapWithCurrentStepReadOnDisk); + oldest); } /** Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2014-07-16 20:45:26 UTC (rev 4039) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2014-07-17 16:04:09 UTC (rev 4040) @@ -29,6 +29,7 @@ Error\ during\ vcs\ initialisation= Error\ while\ uploading\ public\ key\ to\ remote\ serveur\ authorized_keys= Generate\ next\ simulation= +Groups= Import\ one\ java\ file\ script\ source= Import\ simulation\ file\ %s\ in\ directory\ %s\ and\ rename\ from\ %s\ to\ %s= Import\ zipped\ file\ containing\ all\ scripts\ directory\ structure= @@ -68,6 +69,7 @@ Use\ branches,\ switch\ not\ needed= User\ restart\ simulation\ %s= User\ stop\ simulation\ %s= +Zones= an\ alternative\ way\ to\ specify\ the\ scale.= could\ not\ close\ reader\ %1$s=could not close reader %1$s could\ not\ found\ %s= Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-07-16 20:45:26 UTC (rev 4039) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-07-17 16:04:09 UTC (rev 4040) @@ -29,6 +29,7 @@ Error\ during\ vcs\ initialisation= Error\ while\ uploading\ public\ key\ to\ remote\ serveur\ authorized_keys= Generate\ next\ simulation= +Groups= Import\ one\ java\ file\ script\ source= Import\ simulation\ file\ %s\ in\ directory\ %s\ and\ rename\ from\ %s\ to\ %s= Import\ zipped\ file\ containing\ all\ scripts\ directory\ structure= @@ -68,6 +69,7 @@ Use\ branches,\ switch\ not\ needed= User\ restart\ simulation\ %s= User\ stop\ simulation\ %s= +Zones= an\ alternative\ way\ to\ specify\ the\ scale.= could\ not\ close\ reader\ %1$s=could not close reader %1$s could\ not\ found\ %s=

1 0