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

r2661 - in isis-fish/trunk/src: main/java/fr/ifremer/isisfish/datastore main/java/fr/ifremer/isisfish/vcs test/java/fr/ifremer/isisfish/vcs
by chatellier＠users.labs.libre-entreprise.org Oct. 14, 2009

Oct. 14, 2009

Author: chatellier Date: 2009-10-14 07:43:02 +0000 (Wed, 14 Oct 2009) New Revision: 2661 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/FormuleStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/AbstractVCS.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCS.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java Log: Rename method (duplicated "able" in name) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/FormuleStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/FormuleStorage.java 2009-10-13 15:54:10 UTC (rev 2660) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/FormuleStorage.java 2009-10-14 07:43:02 UTC (rev 2661) @@ -103,7 +103,7 @@ File dir = new File(getFormuleDirectory(), category); dir.mkdirs(); for (File f : dir.listFiles()) { - if (getVCS().isVersionnableAbleFile(f)) { + if (getVCS().isVersionnableFile(f)) { String name = FileUtil.basename(f); result.add(getFormule(category, name)); } @@ -128,7 +128,7 @@ File dir = new File(getFormuleDirectory(), category); dir.mkdirs(); for (File f : dir.listFiles()) { - if (getVCS().isVersionnableAbleFile(f)) { + if (getVCS().isVersionnableFile(f)) { String name = FileUtil.basename(f); result.add(name); } @@ -209,7 +209,7 @@ File dir = getFormuleDirectory(); if (dir.exists()) { for (File f : dir.listFiles()) { - if (f.isDirectory() && getVCS().isVersionnableAbleFile(f)) { + if (f.isDirectory() && getVCS().isVersionnableFile(f)) { result.add(f.getName()); } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java 2009-10-13 15:54:10 UTC (rev 2660) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java 2009-10-14 07:43:02 UTC (rev 2661) @@ -128,7 +128,7 @@ boolean result = true; if (getVCS().getLocalRepository().equals(this.file)) { - result = getVCS().isVersionnableAbleFile(file); + result = getVCS().isVersionnableFile(file); } return result; } @@ -283,7 +283,7 @@ if (directory.exists()) { for(File f : directory.listFiles()) { - if(getVCS().isVersionnableAbleFile(f)) { + if(getVCS().isVersionnableFile(f)) { result.add(f.getName()); } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/AbstractVCS.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/AbstractVCS.java 2009-10-13 15:54:10 UTC (rev 2660) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/AbstractVCS.java 2009-10-14 07:43:02 UTC (rev 2661) @@ -173,10 +173,10 @@ } public boolean accept(File pathname) { - return isVersionnableAbleFile(pathname); + return isVersionnableFile(pathname); } - public boolean isVersionnableAbleFile(File file) { + public boolean isVersionnableFile(File file) { String filename = file.getName(); return !".svn".equals(filename) && !"CVS".equals(filename) && !filename.endsWith("~") && Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCS.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCS.java 2009-10-13 15:54:10 UTC (rev 2660) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCS.java 2009-10-14 07:43:02 UTC (rev 2661) @@ -257,7 +257,7 @@ * @param file * @return {@code true} if file is versionnable */ - boolean isVersionnableAbleFile(File file); + boolean isVersionnableFile(File file); /** * Update file. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java 2009-10-13 15:54:10 UTC (rev 2660) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java 2009-10-14 07:43:02 UTC (rev 2661) @@ -355,9 +355,9 @@ * @see fr.ifremer.isisfish.vcs.AbstractVCS#isVersionnableAbleFile(java.io.File) */ @Override - public boolean isVersionnableAbleFile(File file) { + public boolean isVersionnableFile(File file) { - boolean result = super.isVersionnableAbleFile(file); + boolean result = super.isVersionnableFile(file); //result = result && !getSVNManager().getOptions().isIgnored(file); Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java 2009-10-13 15:54:10 UTC (rev 2660) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java 2009-10-14 07:43:02 UTC (rev 2661) @@ -217,42 +217,42 @@ // un fichier special, on refuse File file = new File(".svn"); - boolean result = vcs.isVersionnableAbleFile(file); + boolean result = vcs.isVersionnableFile(file); Assert.assertFalse(result); // Pas dans le repository local, on refuse file = new File("Toto.java"); - result = vcs.isVersionnableAbleFile(file); + result = vcs.isVersionnableFile(file); Assert.assertEquals(false, result); // enfin un bout fichier :) file = new File(vcs.getLocalRepository(), "Toto.java"); - result = vcs.isVersionnableAbleFile(file); + result = vcs.isVersionnableFile(file); Assert.assertEquals(true, result); // match pas (svn ignore) file = new File(vcs.getLocalRepository(), "libaudio.la"); - result = vcs.isVersionnableAbleFile(file); + result = vcs.isVersionnableFile(file); Assert.assertFalse(result); // match pas (svn ignore) file = new File(vcs.getLocalRepository(), "libaudio.lo"); - result = vcs.isVersionnableAbleFile(file); + result = vcs.isVersionnableFile(file); Assert.assertFalse(result); // match (svn ignore) file = new File(vcs.getLocalRepository(), "libaudio.lads"); - result = vcs.isVersionnableAbleFile(file); + result = vcs.isVersionnableFile(file); Assert.assertTrue(result); // match pas (svn ignore) file = new File(vcs.getLocalRepository(), "libaudio.lads~"); - result = vcs.isVersionnableAbleFile(file); + result = vcs.isVersionnableFile(file); Assert.assertFalse(result); // match pas (svn ignore) file = new File(vcs.getLocalRepository(), "commit.rev1234.rej"); - result = vcs.isVersionnableAbleFile(file); + result = vcs.isVersionnableFile(file); Assert.assertFalse(result); }

1 0

r2660 - in isis-fish/trunk/src: main/java/fr/ifremer/isisfish main/java/fr/ifremer/isisfish/datastore main/java/fr/ifremer/isisfish/vcs test/java/fr/ifremer/isisfish/vcs
by chatellier＠users.labs.libre-entreprise.org Oct. 13, 2009

Oct. 13, 2009

Author: chatellier Date: 2009-10-13 15:54:10 +0000 (Tue, 13 Oct 2009) New Revision: 2660 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCS.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSNone.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java Log: Use Version object insteadof VersionNumber Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-10-13 15:42:35 UTC (rev 2659) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-10-13 15:54:10 UTC (rev 2660) @@ -40,7 +40,7 @@ import org.nuiton.util.ApplicationConfig; import org.nuiton.util.ArgumentsParserException; import org.nuiton.util.StringUtil; -import org.nuiton.util.VersionNumber; +import org.nuiton.util.Version; import fr.ifremer.isisfish.actions.ExportAction; import fr.ifremer.isisfish.actions.ImportAction; @@ -121,13 +121,13 @@ * migration de donnees demande automatiquement un changement de version * d'application. */ - protected final static VersionNumber version = new VersionNumber(3, 3, 0, 0); - protected final static VersionNumber databaseVersion = new VersionNumber( + protected final static Version version = new Version(3, 3, 0, 0); + protected final static Version databaseVersion = new Version( version.getNumber(0), version.getNumber(1)); - protected final static VersionNumber apiVersion = new VersionNumber( + protected final static Version apiVersion = new Version( version.getNumber(0), version.getNumber(1), version.getNumber(2)); - public static VersionNumber getVersionNumber() { + public static Version getVersionNumber() { return version; } @@ -144,7 +144,7 @@ * La version de la base ex: 3.2 * @return */ - public static VersionNumber getDatabaseVersion() { + public static Version getDatabaseVersion() { return databaseVersion; } @@ -152,7 +152,7 @@ * La version de l'api de programmation ex: 3.2.0 * @return */ - public static VersionNumber getApiVersion() { + public static Version getApiVersion() { return apiVersion; } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-10-13 15:42:35 UTC (rev 2659) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-10-13 15:54:10 UTC (rev 2660) @@ -47,7 +47,7 @@ import org.nuiton.topia.TopiaException; import org.nuiton.util.FileUtil; import org.nuiton.util.LocaleConverter; -import org.nuiton.util.VersionNumber; +import org.nuiton.util.Version; import org.nuiton.widget.SwingUtil; import fr.ifremer.isisfish.datastore.AnalysePlanStorage; @@ -427,7 +427,7 @@ IsisConfig.getApiVersion()), null); } else { // Si on utilise pas le bon tag on change de tag - VersionNumber tag = IsisConfig.getApiVersion(); + Version tag = IsisConfig.getApiVersion(); if (!vcs.isTag(tag)) { // pas de tag pour cette version, on checkout le trunk tag = null; @@ -482,7 +482,7 @@ log.info(_("Use branches, switch not needed")); } else { // Si on utilise pas le bon tag on change de tag - VersionNumber tag = IsisConfig.getApiVersion(); + Version tag = IsisConfig.getApiVersion(); if (vcs.isTag(tag)) { // un tag dispo, on a donc pas la derniere version, on switch Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java 2009-10-13 15:42:35 UTC (rev 2659) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java 2009-10-13 15:54:10 UTC (rev 2660) @@ -30,7 +30,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.util.FileUtil; import org.nuiton.util.ListenerSet; -import org.nuiton.util.VersionNumber; +import org.nuiton.util.Version; import fr.ifremer.isisfish.IsisConfig; import fr.ifremer.isisfish.IsisFish; @@ -262,7 +262,7 @@ */ public static void checkout(File destDir, String module) throws VCSException { // Si on utilise pas le bon tag on change de tag - VersionNumber tag = IsisConfig.getApiVersion(); + Version tag = IsisConfig.getApiVersion(); if (!getVCS().isTag(tag)) { // pas de tag pour cette version, on checkout le trunk tag = null; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCS.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCS.java 2009-10-13 15:42:35 UTC (rev 2659) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCS.java 2009-10-13 15:54:10 UTC (rev 2660) @@ -22,7 +22,7 @@ import java.util.List; import java.util.Map; -import org.nuiton.util.VersionNumber; +import org.nuiton.util.Version; /** * Version control system. @@ -157,7 +157,7 @@ * @param recurse if file is directory checkout sub file * @throws VCSException */ - void checkout(VersionNumber tag, boolean recurse) throws VCSException; + void checkout(Version tag, boolean recurse) throws VCSException; /** * Delete and commit files in server repository. @@ -235,7 +235,7 @@ * @return true if tag found with this name * @throws VCSException */ - boolean isTag(VersionNumber version) throws VCSException; + boolean isTag(Version version) throws VCSException; /** * Check if file is up-to-date. @@ -350,7 +350,7 @@ * @return a list of all file in conflict * @throws VCSException */ - List<File> setTag(VersionNumber version) throws VCSException; + List<File> setTag(Version version) throws VCSException; /** * Change host. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSNone.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSNone.java 2009-10-13 15:42:35 UTC (rev 2659) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSNone.java 2009-10-13 15:54:10 UTC (rev 2660) @@ -23,7 +23,7 @@ import java.util.List; import java.util.Map; -import org.nuiton.util.VersionNumber; +import org.nuiton.util.Version; /** * VCSNone (svn or vcs) must extends this class. This class can be used as dummy @@ -52,7 +52,7 @@ * @param version version number like 3.2 * @return true if tag found with this name */ - public boolean isTag(VersionNumber version) throws VCSException { + public boolean isTag(Version version) throws VCSException { return false; } @@ -111,7 +111,7 @@ * @param b * @throws VCSException */ - public void checkout(VersionNumber tag, boolean b) throws VCSException { + public void checkout(Version tag, boolean b) throws VCSException { throw new VCSException("Can't checkout with dummy VCS"); } @@ -202,7 +202,7 @@ return false; } - public List<File> setTag(VersionNumber version) throws VCSException { + public List<File> setTag(Version version) throws VCSException { // do nothing return null; } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java 2009-10-13 15:42:35 UTC (rev 2659) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java 2009-10-13 15:54:10 UTC (rev 2660) @@ -32,7 +32,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.VersionNumber; +import org.nuiton.util.Version; import org.tmatesoft.svn.core.ISVNDirEntryHandler; import org.tmatesoft.svn.core.SVNCommitInfo; import org.tmatesoft.svn.core.SVNDepth; @@ -507,10 +507,10 @@ } /* - * @see org.nuiton.isisfish.vcs.VCS#checkout(org.nuiton.util.VersionNumber, boolean) + * @see org.nuiton.isisfish.vcs.VCS#checkout(org.nuiton.util.Version, boolean) */ @Override - public void checkout(VersionNumber tag, boolean recurse) + public void checkout(Version tag, boolean recurse) throws VCSException { try { if (fireAction(VCSActionEvent.CHECKOUT, getLocalRepository())) { @@ -1106,10 +1106,10 @@ } /* - * @see org.nuiton.isisfish.vcs.VCS#isTag(org.nuiton.util.VersionNumber) + * @see org.nuiton.isisfish.vcs.VCS#isTag(org.nuiton.util.Version) */ @Override - public boolean isTag(VersionNumber version) throws VCSException { + public boolean isTag(Version version) throws VCSException { boolean result = version == null; // le trunk exist toujours if (!result) { try { @@ -1152,10 +1152,10 @@ } /* - * @see org.nuiton.isisfish.vcs.VCS#setTag(org.nuiton.util.VersionNumber) + * @see org.nuiton.isisfish.vcs.VCS#setTag(org.nuiton.util.Version) */ @Override - public List<File> setTag(VersionNumber version) throws VCSException { + public List<File> setTag(Version version) throws VCSException { List<File> filesInConflict = null; Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java 2009-10-13 15:42:35 UTC (rev 2659) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java 2009-10-13 15:54:10 UTC (rev 2660) @@ -28,7 +28,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.FileUtil; -import org.nuiton.util.VersionNumber; +import org.nuiton.util.Version; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -311,7 +311,7 @@ vcs.add(Arrays.asList(fileToAdd), "ajout d'un fichier"); // test switchTag - vcs.setTag(new VersionNumber(3, 1, 0)); + vcs.setTag(new Version(3, 1, 0)); Assert.assertTrue(vcs.getTag().startsWith("/tags/3.1.0")); Assert.assertEquals(FILECONTENTTAG, FileUtil.readAsString(version)); Assert.assertTrue(demo.exists()); @@ -383,7 +383,7 @@ String msg = ""; // checkout a TAG - vcs.checkout(new VersionNumber(3, 1, 0), false); + vcs.checkout(new Version(3, 1, 0), false); try { vcs.add(files, msg); @@ -881,10 +881,10 @@ log.info("testGetDiff()"); } - VersionNumber version = new VersionNumber(3, 1, 0); + Version version = new Version(3, 1, 0); Assert.assertTrue(vcs.isTag(version)); - version = new VersionNumber(3, 2, 0); + version = new Version(3, 2, 0); Assert.assertFalse(vcs.isTag(version)); } @@ -1136,7 +1136,7 @@ } // chechout tags - vcs.checkout(new VersionNumber(3, 1, 0), false); + vcs.checkout(new Version(3, 1, 0), false); // modif on remote repo on tag :) File file = new File(vcs.getLocalRepository(), "scripts" @@ -1165,7 +1165,7 @@ FileUtil.writeString(file2, "oooooo"); // try to update... - List<File> filesInConflict = vcs.setTag(new VersionNumber(3, 1, 0)); + List<File> filesInConflict = vcs.setTag(new Version(3, 1, 0)); Assert.assertNotNull(filesInConflict); Assert.assertEquals(1, filesInConflict.size()); log.debug("Conflicts are : " + filesInConflict);

1 0

r2659 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org Oct. 13, 2009

Oct. 13, 2009

Author: chatellier Date: 2009-10-13 15:42:35 +0000 (Tue, 13 Oct 2009) New Revision: 2659 Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/pom.xml Log: Update svnkit (1.3.1) Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-10-13 15:00:50 UTC (rev 2658) +++ isis-fish/trunk/changelog.txt 2009-10-13 15:42:35 UTC (rev 2659) @@ -1,5 +1,6 @@ isis-fish (3.3.0.0) stable; urgency=low + * Update to svnkit 1.3.1 * Unification of error frames * Move codelutin libs to nuiton.org Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-10-13 15:00:50 UTC (rev 2658) +++ isis-fish/trunk/pom.xml 2009-10-13 15:42:35 UTC (rev 2659) @@ -301,15 +301,15 @@  <dependency> - <groupId>org.tmatesoft</groupId> + <groupId>org.tmatesoft.svnkit</groupId> <artifactId>svnkit</artifactId> - <version>1.2.3.5521</version> + <version>1.3.1</version> <scope>compile</scope> </dependency> <dependency> <groupId>com.trilead</groupId> <artifactId>trilead-ssh2</artifactId> - <version>build213-svnkit-1.2</version> + <version>build213-svnkit-1.3-patch</version> <scope>runtime</scope> </dependency>

1 0

Oct. 13, 2009

Author: chatellier Date: 2009-10-13 15:00:50 +0000 (Tue, 13 Oct 2009) New Revision: 2658 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/ErrorHelper.java isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/ActiveRuleImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/CellImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/EffortDescriptionImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/EquationImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/FisheryRegionImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/GearImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/MetierImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/PopulationGroupImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/PortImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/ResultImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/SeasonImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/SelectivityImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/SetOfVesselsImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/SpeciesImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/StrategyImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/TargetSpeciesImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/TripTypeImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/VesselTypeImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/ZoneImpl.hbm.xml isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/TestIsisH2Config.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/migration/ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/migration/TestMigrationCallbackHandler.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/util/ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/util/ErrorHelperTest.java Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/pom.xml isis-fish/trunk/src/main/assembly/bin.xml isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisTray.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/AnalysePlanStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/FormuleStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/SwingMigrationCallbackHandler.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/EffortDescriptionImpl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/EquationImpl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/FisheryRegionImpl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SeasonImpl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SelectivityImpl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/TargetSpeciesImpl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/TripTypeImpl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/VesselTypeImpl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/EmigrationEquation.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/ImmigrationEquation.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/MigrationEquation.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationReproductionEquation.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.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/logging/console/LogMail.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/CellSelectionLayer.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/map/ZoneDelimiterLayer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/rule/RuleHelper.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/MetierMonitor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationMeta.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScript.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultGetter.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultListener.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultXML.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulatorServer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/IsisFishServerSimulationLauncher.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationExecutor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.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/domain/MatrixContinuousDomain.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/Date.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/Month.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/TimeUnit.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/ApplicationMonitorUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/Help.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/config/IsisConfigTableModel.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CopyMapToClipboardListener.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultFrame.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableModel.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearPopulationSelectivityModel.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoTargetSpeciesModel.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/logging/console/LogConsoleUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/analyzeplan/AnalyzePlanComboRenderer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/analyzeplan/AnalyzePlanParametersTableModel.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportNameListRenderer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportParametersTableModel.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/result/ResultListRenderer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleComboRenderer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersTableModel.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivity/SensitivityCalculatorComboRenderer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivity/SensitivityCalculatorParametersTableModel.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListRenderer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportParametersTableModel.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/queue/QueueAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/DataResult.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/DataResultUI.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanModel.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanUI.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphComboRenderer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphMatrixNDDataset.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/InfoItem.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemDate.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemDateUI.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemUI.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/MatrixInfoTableModel.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultEdit.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultEditUI.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUI.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResumePanelUI.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/SimpleResultatMapBean.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/SimpleResultatMapBeanUI.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ExportDialogUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/FileSelectionTableModel.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/action/BackupAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/action/ChooseFileAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/action/ExportAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/action/ImportAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeCellRenderer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulatorListeners.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterUtil.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/CommitDialogUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateConfirmDialogUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateDialogUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/VCSConnectionState.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterColumnEditor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java 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/FilterPanelUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ClasspathTemplateLoader.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ConverterUtil.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/DocHelper.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/MatrixConverter.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/StringConverter.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/TopiaEntityConverter.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHAgent.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCS.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSFactory.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSNone.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties isis-fish/trunk/src/main/resources/templates/script/analyseplan.ftl isis-fish/trunk/src/main/resources/templates/script/export.ftl isis-fish/trunk/src/main/resources/templates/script/rule.ftl isis-fish/trunk/src/main/resources/templates/script/script.ftl isis-fish/trunk/src/main/resources/templates/script/sensitivity.ftl isis-fish/trunk/src/main/resources/templates/script/sensitivityexport.ftl isis-fish/trunk/src/main/resources/templates/script/simulator.ftl isis-fish/trunk/src/main/xmi/isis-fish.properties isis-fish/trunk/src/main/xmi/isis-fish.zargo isis-fish/trunk/src/site/site_en.xml isis-fish/trunk/src/site/site_fr.xml isis-fish/trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/ScriptStorageTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/entity/PersistenceTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/entity/PopulationSeasonInfoTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/logging/LoggerHelper.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/logging/io/LineReaderTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationHelperTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationParameterTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/types/MonthTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java Log: Move codelutin libs to nuiton.org Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/changelog.txt 2009-10-13 15:00:50 UTC (rev 2658) @@ -1,7 +1,10 @@ -isis-fish (3.2.0.8) stable; urgency=low +isis-fish (3.3.0.0) stable; urgency=low - -- lun. sept. 28 19:52:53 CEST 2009 + * Unification of error frames + * Move codelutin libs to nuiton.org + -- mar. oct. 13 09:48:15 CEST 2009 + isis-fish (3.2.0.7) stable; urgency=low * Fix a missing hashCode() problem in month (cause problem in matrixND) Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/pom.xml 2009-10-13 15:00:50 UTC (rev 2658) @@ -1,98 +1,80 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> -  -  -  - <parent> - <groupId>org.codelutin</groupId> - <artifactId>lutinproject</artifactId> - <version>3.5</version> - </parent> - <groupId>ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>3.2.0.8-SNAPSHOT</version> + <version>3.3.0.0-SNAPSHOT</version>  <dependencies> -  - +  <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>${nuiton-utils.version}</version> <scope>compile</scope> </dependency> -  <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinutil</artifactId> - <version>${lutinutil.version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.codelutin.topia</groupId> + <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> <version>${topia.version}</version> <scope>compile</scope> </dependency> <dependency> - <groupId>org.codelutin</groupId> - <artifactId>topia-service</artifactId> - <version>${topia.service.version}</version> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-service-migration</artifactId> + <version>${topia.version}</version> <scope>compile</scope> </dependency> <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinmatrix</artifactId> - <version>${lutinmatrix.version}</version> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-matrix</artifactId> + <version>2.0.1-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinwidget</artifactId> - <version>${lutinwidget.version}</version> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-widgets</artifactId> + <version>${nuiton-widgets.version}</version> <scope>compile</scope> </dependency> -  +  <dependency> - <groupId>org.codelutin.jaxx</groupId> + <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-runtime-swing</artifactId> <version>${jaxx.version}</version> <scope>compile</scope> </dependency> <dependency> - <groupId>org.codelutin.jaxx</groupId> - <artifactId>jaxx-runtime-validator</artifactId> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-runtime-api</artifactId> <version>${jaxx.version}</version> <scope>compile</scope> </dependency> <dependency> - <groupId>org.codelutin.jaxx</groupId> + <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-runtime-swing-widget</artifactId> <version>${jaxx.version}</version> <scope>compile</scope> </dependency> -  <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinj2r</artifactId> - <version>${lutinj2r.version}</version> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-j2r</artifactId> + <version>1.0.0</version> <scope>compile</scope> </dependency> - +  <dependency> <groupId>commons-jxpath</groupId> @@ -109,13 +91,6 @@ </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-math</artifactId> - <version>2.0</version> - <scope>compile</scope> - </dependency> - - <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> <version>3.2.1</version> @@ -137,6 +112,27 @@ </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-math</artifactId> + <version>2.0</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + <scope>compile</scope> + </dependency> + + <dependency> <groupId>dom4j</groupId> <artifactId>dom4j</artifactId> <version>1.6.1</version> @@ -158,7 +154,7 @@ <scope>compile</scope> </dependency> -  +  <dependency> <groupId>org.apache.xmlrpc</groupId> <artifactId>xmlrpc-client</artifactId> @@ -191,7 +187,7 @@ <dependency> <groupId>openmap</groupId> <artifactId>openmap</artifactId> - <version>${openmap.version}</version> + <version>4.6.4</version> <scope>compile</scope> </dependency> @@ -201,7 +197,7 @@ <version>1.3.4</version> <scope>runtime</scope> </dependency> - + <dependency> <groupId>com.jcraft</groupId> <artifactId>jsch</artifactId> @@ -209,6 +205,13 @@ <scope>compile</scope> </dependency> + <dependency> + <groupId>org.swinglabs</groupId> + <artifactId>swingx</artifactId> + <version>1.0</version> + <scope>compile</scope> + </dependency> +  <dependency> <groupId>jaxen</groupId> @@ -221,7 +224,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.1.118</version> + <version>1.1.119</version> <scope>compile</scope> </dependency> @@ -316,7 +319,7 @@ <artifactId>freemarker</artifactId> <version>2.3.15</version> </dependency> - + <dependency> <groupId>net.sourceforge.cpdetector</groupId> <artifactId>cpdetector</artifactId> @@ -327,8 +330,15 @@ <dependency> <groupId>com.sun</groupId> <artifactId>tools</artifactId> - <version>1.6.0</version> + <version>1.6.0.16</version> </dependency> + +  + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.7</version> + </dependency> </dependencies>  @@ -338,6 +348,13 @@ <description>Simulateur de pecherie complexe.</description> <inceptionYear>1999</inceptionYear> + <url>http://isis-fish.labs.libre-entreprise.org/isis-fish</url> + + <organization> + <name>CodeLutin</name> + <url>http://www.codelutin.com/</url> + </organization> + <licenses> <license> <name>GPL</name> @@ -346,81 +363,181 @@ </license> </licenses> + <mailingLists> + <mailingList> + <name>isis-fish-commits</name> + <subscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/isis-fish-commits</subscribe> + <unsubscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/isis-fish-commits</unsubscribe> + <post>isis-fish-commits at lists.lists.labs.libre-entreprise.org</post> + <archive>http://lists.labs.libre-entreprise.org/pipermail/isis-fish-commits/</archive> + </mailingList> + <mailingList> + <name>isis-fish-devel</name> + <subscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/isis-fish-devel</subscribe> + <unsubscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/isis-fish-devel</unsubscribe> + <post>isis-fish-devel at lists.lists.labs.libre-entreprise.org</post> + <archive>http://lists.labs.libre-entreprise.org/pipermail/isis-fish-devel/</archive> + </mailingList> + <mailingList> + <name>isis-fish-user</name> + <subscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/isis-fish-user</subscribe> + <unsubscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/isis-fish-user</unsubscribe> + <post>isis-fish-user at lists.lists.labs.libre-entreprise.org</post> + <archive>http://lists.labs.libre-entreprise.org/pipermail/isis-fish-user/</archive> + </mailingList> + </mailingLists> + + <issueManagement> + <system>gforge</system> + <url>http://labs.libre-entreprise.org/tracker/?group_id=8</url> + </issueManagement> + + <ciManagement> + <system>hudson</system> + <url>http://hudson.codelutin.com/hudson</url> + </ciManagement> + + <developers> + <developer> + <id>bpoussin</id> + <name>Benjamin Poussin</name> + <email>poussin at codelutin.com</email> + <organization>CodeLutin</organization> + <roles> + <role>Développeur</role> + <role>Debian packager</role> + </roles> + <timezone>+2</timezone> + </developer> + <developer> + <id>chatellier</id> + <name>Eric Chatellier</name> + <email>chatellier at codelutin.com</email> + <organization>CodeLutin</organization> + <roles> + <role>Développeur</role> + </roles> + <timezone>+2</timezone> + </developer> + <developer> + <id>tchemit</id> + <name>Tony Chemit</name> + <email>chemit at codelutin.com</email> + <organization>CodeLutin</organization> + <roles> + <role>Développeur</role> + </roles> + <timezone>+2</timezone> + </developer> + <developer> + <id>sletellier</id> + <name>Sylvain Letellier</name> + <email>letellier at codelutin.com</email> + <organization>CodeLutin</organization> + <roles> + <role>Développeur</role> + </roles> + <timezone>+2</timezone> + </developer> + </developers> +    <packaging>jar</packaging> <properties> -  - <labs.id>8</labs.id> - -  - <labs.project>isis-fish</labs.project> -  - <jaxx.version>1.5.1</jaxx.version> - <topia.version>2.1.6.1</topia.version> - <topia.service.version>1.0.3</topia.service.version> - <lutinmatrix.version>1.3</lutinmatrix.version> - <lutinutil.version>1.0.6</lutinutil.version> - <i18n.version>0.9</i18n.version> - <lutinwidget.version>0.14.1</lutinwidget.version> - <generator.version>0.64</generator.version> - <lutinj2r.version>0.4</lutinj2r.version> - <jrst.version>0.8.4</jrst.version> - <license-switcher.version>0.6</license-switcher.version> - <openmap.version>4.6.4</openmap.version> + <jaxx.version>1.7.1</jaxx.version> + <topia.version>2.2.1</topia.version> + <nuiton-utils.version>1.1.2-SNAPSHOT</nuiton-utils.version> + <nuiton-i18n.version>1.0.1</nuiton-i18n.version> + <nuiton-widgets.version>1.0.0</nuiton-widgets.version> + <eugene.version>1.0.0</eugene.version> + <jrst.version>1.0.0</jrst.version> <aspectwerkz.version>2.0</aspectwerkz.version> <xmlrpc.version>3.1.2</xmlrpc.version> -  - <maven.test.forkMode>once</maven.test.forkMode> - -  - <maven.jar.main.class>fr.ifremer.isisfish.IsisFish</maven.jar.main.class> - -  +  - <jnlpCodebase>file://${jnlp.build.directory}</jnlpCodebase> + <jnlpCodebase>file://${jnlp.build.directory}</jnlpCodebase> --> + + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputDirectory>UTF-8</project.reporting.outputDirectory> </properties> <build> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <mainClass>fr.ifremer.isisfish.IsisFish</mainClass> + <classpathPrefix>lib/</classpathPrefix> + </manifest> + </archive> + </configuration> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemProperties> + <property> + <name>java.io.tmpdir</name> + <value>${project.build.directory}/surefire-workdir</value> + </property> + </systemProperties> + </configuration> + </plugin> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <version>2.0.1</version> + <configuration> + <locales>fr,en</locales> + </configuration> + <dependencies> + <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>1.0.0</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> + <plugins> - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-generator-plugin</artifactId> - <version>${generator.version}</version> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <version>${eugene.version}</version> <executions> <execution> - <id>Generator</id> + <id>eugene-generation</id> <phase>generate-sources</phase> <configuration> - <srcDirZuml>${project.basedir}/src/main/xmi</srcDirZuml> - <srcXmiDest>${maven.gen.dir}/xmi/</srcXmiDest> <fullPackagePath>fr.ifremer.isisfish</fullPackagePath> <extractedPackages>fr.ifremer.isisfish</extractedPackages> -  - <srcGenDest>${maven.gen.dir}/objectmodel/</srcGenDest> <includes>**/*.objectmodel</includes> - <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> - <excludeTemplates> - <value>org.codelutin.topia.generator.EntityEnumGenerator</value> - <value>org.codelutin.topia.generator.EntityProviderGenerator</value> - </excludeTemplates> - <destDirGen>${maven.gen.dir}/java</destDirGen> + <templates>org.nuiton.topia.generator.TopiaMetaGenerator</templates> <defaultPackage>fr.ifremer.isisfish</defaultPackage> - <copyVersionDir>${project.basedir}/src/main/resources/oldmappings/%MODELNAME% - </copyVersionDir> + <copyVersionDir>${basedir}/src/main/resources/oldmappings/%MODELNAME%</copyVersionDir> <copyVersionFiles>**/*.hbm.xml</copyVersionFiles> - <copyOverwrite>true</copyOverwrite> </configuration> <goals> <goal>zargo2xmi</goal> @@ -432,7 +549,7 @@ </executions> <dependencies> <dependency> - <groupId>org.codelutin.topia</groupId> + <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> <version>${topia.version}</version> <scope>runtime</scope> @@ -441,7 +558,7 @@ </plugin> <plugin> - <groupId>org.codelutin.jaxx</groupId> + <groupId>org.nuiton.jaxx</groupId> <artifactId>maven-jaxx-plugin</artifactId> <version>${jaxx.version}</version> <executions> @@ -450,7 +567,8 @@ <goal>generate</goal> </goals> <configuration> - <extraImportList>jaxx.runtime.SwingUtil</extraImportList> + <src>${basedir}/src/main/java</src> + <extraImportList>jaxx.runtime.SwingUtil</extraImportList> <addSourcesToClassPath>true</addSourcesToClassPath> <addProjectClassPath>true</addProjectClassPath> </configuration> @@ -459,17 +577,13 @@ </plugin> <plugin> - <groupId>org.codelutin</groupId> + <groupId>org.nuiton.i18n</groupId> <artifactId>maven-i18n-plugin</artifactId> - <version>${i18n.version}</version> + <version>${nuiton-i18n.version}</version> <configuration> <entries> <entry> - <basedir>${maven.gen.dir}/java/</basedir> - <specificGoal>parserJava</specificGoal> - <includes> - <param>**\/**UI.java</param> - </includes> + <basedir>${project.build.directory}/generated-sources/java/</basedir> </entry> </entries> </configuration> @@ -483,34 +597,23 @@ </executions> </plugin> -  <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-jrst-plugin</artifactId> - <version>${jrst.version}</version> - <configuration> - <defaultLocale>fr</defaultLocale> - </configuration> + <artifactId>maven-dependency-plugin</artifactId> <executions> <execution> - <phase>pre-site</phase> + <id>copy-dependencies</id> + <phase>package</phase> + <configuration> + <outputDirectory>${project.build.directory}/lib</outputDirectory> + </configuration> <goals> - <goal>jrst</goal> + <goal>copy-dependencies</goal> </goals> </execution> </executions> </plugin> <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-dependencies</id> - </execution> - </executions> - </plugin> - - <plugin> <artifactId>maven-assembly-plugin</artifactId> <version>2.2-beta-4</version> <configuration> @@ -529,33 +632,6 @@ </executions> </plugin> </plugins> - - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addClasspath>true</addClasspath> - <classpathPrefix>lib/</classpathPrefix> - </manifest> - </archive> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <systemProperties> - <property> - <name>java.io.tmpdir</name> - <value>${project.build.directory}/surefire-workdir</value> - </property> - </systemProperties> - </configuration> - </plugin> - </plugins> - </pluginManagement> </build> <reporting> @@ -563,24 +639,20 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.6</version> + <version>2.5</version> <configuration> <links> <link>http://java.sun.com/javase/6/docs/api/</link> - <link>http://lutinutil.labs.libre-entreprise.org/lutinutil/apidocs/</link> - <link>http://lutinmatrix.labs.libre-entreprise.org/lutinmatrix/apidocs/</link> - <link>http://topia.labs.libre-entreprise.org/topia/topia-persistence/apidocs/</link> + <link>http://maven-site.nuiton.org/nuiton-utils/apidocs/</link> + <link>http://maven-site.nuiton.org/nuiton-matrix/apidocs/</link> + <link>http://maven-site.nuiton.org/nuiton-j2r/apidocs/</link> + <link>http://maven-site.nuiton.org/topia/topia-persistence/apidocs/</link> </links> </configuration> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <version>2.1</version> - </plugin> </plugins> </reporting> - +    @@ -590,23 +662,51 @@ <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/isis-fish/trunk…</url> </scm> -  <repositories> <repository> - <id>codelutin-repository</id> - <name>CodeLutinRepository</name> + <id>labs.repository</id> <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> </repository> + <repository> + <id>javanet.repository</id> + <url>http://download.java.net/maven/2/</url> + </repository> + <repository> + <id>nuiton.release</id> + <url>http://maven.nuiton.org/release</url> + </repository> + <repository> + <id>nuiton.snapshot</id> + <url>http://maven.nuiton.org/snapshot</url> + </repository> </repositories> - + + <pluginRepositories> + <pluginRepository> + <id>labs.plugin.repository</id> + <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> + </pluginRepository> + <pluginRepository> + <id>nuiton.plugin.release</id> + <url>http://maven.nuiton.org/release</url> + </pluginRepository> + <pluginRepository> + <id>nuiton.plugin.snapshot</id> + <url>http://maven.nuiton.org/snapshot</url> + </pluginRepository> + </pluginRepositories> + + <distributionManagement> + <repository> + <id>labs</id> + <url>scpexe://labs.libre-entreprise.org/home/groups/lutinbuilder/htdocs/maven2</url> + </repository> + <site> + <id>labs</id> + <url>scpexe://labs.libre-entreprise.org/home/groups/isis-fish/htdocs/isis-fish</url> + </site> + </distributionManagement> + <profiles> <profile> <id>release-profile</id> @@ -621,27 +721,25 @@  <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-license-switcher-plugin</artifactId> - <version>${license-switcher.version}</version> - <configuration> - <licenseName>${license-switcher.licenseName}</licenseName> - </configuration> + <groupId>org.nuiton</groupId> + <artifactId>maven-license-plugin</artifactId> + <version>2.0.0</version> <executions> <execution> <id>attach-licenses</id> <goals> -  - <goal>third-party</goal> +  + <goal>add-third-party</goal> </goals> </execution> </executions> - </plugin> + </plugin> +  + <!- - Ajout des libs signe par Sun dans un fichier jnlp separe - -> <execution> <id>JnlpSun</id> <phase>verify</phase> @@ -688,7 +786,7 @@ <fileset dir="${jnlp.build.directory}"> <include name="**" /> </fileset> -  + <!- - should be better to use the deployed assembly in lutinbuilder ? - -> <fileset dir="target"> <include name="${project.build.finalName}-bin.zip" /> </fileset> @@ -759,7 +857,7 @@ <gzip>true</gzip> <verbose>false</verbose> </configuration> - </plugin> + </plugin> --> </plugins> </build> Modified: isis-fish/trunk/src/main/assembly/bin.xml =================================================================== --- isis-fish/trunk/src/main/assembly/bin.xml 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/assembly/bin.xml 2009-10-13 15:00:50 UTC (rev 2658) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.0.0.xsd"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.1.xsd"> <id>bin</id> <formats> <format>zip</format> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,7 +19,7 @@ package fr.ifremer.isisfish; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.File; import java.net.MalformedURLException; @@ -37,10 +37,10 @@ import org.apache.commons.lang.time.DurationFormatUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.util.ApplicationConfig; -import org.codelutin.util.ArgumentsParserException; -import org.codelutin.util.StringUtil; -import org.codelutin.util.VersionNumber; +import org.nuiton.util.ApplicationConfig; +import org.nuiton.util.ArgumentsParserException; +import org.nuiton.util.StringUtil; +import org.nuiton.util.VersionNumber; import fr.ifremer.isisfish.actions.ExportAction; import fr.ifremer.isisfish.actions.ImportAction; @@ -74,7 +74,7 @@ * * Refactored, can't be in enum * - * @see org.codelutin.util.ApplicationConfig.Action.Step + * @see org.nuiton.util.ApplicationConfig.Action.Step */ public static final int STEP_AFTER_INIT = 0; @@ -83,7 +83,7 @@ * * Refactored, can't be in enum * - * @see org.codelutin.util.ApplicationConfig.Action.Step + * @see org.nuiton.util.ApplicationConfig.Action.Step */ public static final int STEP_AFTER_INIT_VCS = 1; @@ -92,7 +92,7 @@ * * Refactored, can't be in enum * - * @see org.codelutin.util.ApplicationConfig.Action.Step + * @see org.nuiton.util.ApplicationConfig.Action.Step */ public static final int STEP_AFTER_UI = 2; @@ -101,7 +101,7 @@ * * Refactored, can't be in enum * - * @see org.codelutin.util.ApplicationConfig.Action.Step + * @see org.nuiton.util.ApplicationConfig.Action.Step */ public static final int STEP_BEFORE_EXIT = 3; @@ -121,7 +121,7 @@ * migration de donnees demande automatiquement un changement de version * d'application. */ - protected final static VersionNumber version = new VersionNumber(3, 2, 0, 8); + protected final static VersionNumber version = new VersionNumber(3, 3, 0, 0); protected final static VersionNumber databaseVersion = new VersionNumber( version.getNumber(0), version.getNumber(1)); protected final static VersionNumber apiVersion = new VersionNumber( @@ -195,7 +195,7 @@ ////////////////////////////////////////////////// /* - * @see org.codelutin.util.ApplicationConfig#getOption(java.lang.String) + * @see org.nuiton.util.ApplicationConfig#getOption(java.lang.String) */ @Override public String getOption(String key) { @@ -802,7 +802,7 @@ * TODO: lors du passage en version 4.0 on pourrait supprimer cette methode * * @param args - * @throws org.codelutin.util.ArgumentsParserException + * @throws org.nuiton.util.ArgumentsParserException */ @Override public void parse(String[] args) throws ArgumentsParserException { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -18,16 +18,18 @@ package fr.ifremer.isisfish; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.awt.Component; import java.awt.Dimension; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.io.File; +import java.io.IOException; import java.text.SimpleDateFormat; import java.util.List; import java.util.Locale; +import java.util.Map; import javax.swing.JLabel; import javax.swing.JOptionPane; @@ -39,15 +41,14 @@ import org.apache.commons.beanutils.ConvertUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.i18n.I18n; -import org.codelutin.log.UserLog; -import org.codelutin.math.matrix.DoubleBigVector; -import org.codelutin.math.matrix.MatrixFactory; -import org.codelutin.topia.TopiaException; -import org.codelutin.util.FileUtil; -import org.codelutin.util.LocaleConverter; -import org.codelutin.util.VersionNumber; -import org.codelutin.widget.SwingUtil; +import org.nuiton.i18n.I18n; +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.VersionNumber; +import org.nuiton.widget.SwingUtil; import fr.ifremer.isisfish.datastore.AnalysePlanStorage; import fr.ifremer.isisfish.datastore.ExportStorage; @@ -65,6 +66,7 @@ import fr.ifremer.isisfish.types.RangeOfValues; import fr.ifremer.isisfish.types.TimeUnit; import fr.ifremer.isisfish.ui.WelcomeUI; +import fr.ifremer.isisfish.ui.util.ErrorHelper; import fr.ifremer.isisfish.util.ConverterUtil; import fr.ifremer.isisfish.util.DateConverter; import fr.ifremer.isisfish.util.MonthConverter; @@ -133,6 +135,8 @@ log.warn(_("Error during vcs initialisation"), eee); } + doNuitonMigration(); + if (log.isInfoEnabled()) { log.info(_("isisfish.launching", config.getElapsedTimeAsString())); } @@ -169,6 +173,60 @@ } /** + * Move user script to nuiton dependants packages. + * + * Find all files containing "org.codelutin." into "org.nuiton." + */ + protected static void doNuitonMigration() { + + try { + Map<File, List<CharSequence>> filesToMigrate = FileUtil.grep("org\\.codelutin\\.", IsisFish.config.getDatabaseDirectory(), ".*\\.java", "ISO-8859-1"); + + if (filesToMigrate != null && !filesToMigrate.isEmpty()) { + + // yes by defaut (for tests) + // but ask user if UI launch + boolean migrationOption = true; + if (IsisFish.config.isLaunchUI()) { + // display a user frame + String migratedFiles = ""; + String separator = ""; + for (File fileToMigrate : filesToMigrate.keySet()) { + migratedFiles += separator + fileToMigrate.toString(); + separator = "\n"; + } + JLabel labelModifiedFiles = new JLabel(_("isisfish.misc.nuitonmigration")); + JTextArea areaModifiedFiles = new JTextArea(migratedFiles); + areaModifiedFiles.setEditable(false); + areaModifiedFiles.setAutoscrolls(true); + JScrollPane sp = new JScrollPane(areaModifiedFiles); + sp.setPreferredSize(new Dimension(500, 100)); // don't remove popup is huge + migrationOption = ask(new Component[] { labelModifiedFiles, sp} ); + } + + // if migration has to be done + if (migrationOption) { + if (log.isInfoEnabled()) { + log.info("Starting nuiton.org migration for user scripts :"); + } + + for (File fileToMigrate : filesToMigrate.keySet()) { + if (log.isInfoEnabled()) { + log.info(" migrate file : " + fileToMigrate.getAbsolutePath()); + } + FileUtil.sed("org\\.codelutin\\.", "org.nuiton.", fileToMigrate, "ISO-8859-1"); + } + } + } + } + catch(IOException eee) { + if (log.isErrorEnabled()) { + log.error("Can't to nuiton migration", eee); + } + } + } + + /** * Install "Nimbus" LookAndFeel if available. * * @throws InstantiationException @@ -298,7 +356,7 @@ if (value == JOptionPane.CANCEL_OPTION) { quit(); } - result = value == JOptionPane.OK_OPTION; + result = value == JOptionPane.YES_OPTION; return result; } @@ -364,9 +422,9 @@ log.info(_("Local repository don't exist")); } if (!vcs.isConnected()) { - UserLog.warn(_( + ErrorHelper.showErrorDialog(_( "isisfish.vcs.init.notfoundcantdownload", - IsisConfig.getDatabaseVersion())); + IsisConfig.getApiVersion()), null); } else { // Si on utilise pas le bon tag on change de tag VersionNumber tag = IsisConfig.getApiVersion(); @@ -524,7 +582,7 @@ /** * Initialise les convertiseurs utilisé par commons-beansutils. * - * @deprecated since 3.2.0.5 duplicated with {@link ConverterUtil#getConverter(org.codelutin.topia.TopiaContext)} + * @deprecated since 3.2.0.5 duplicated with {@link ConverterUtil#getConverter(org.nuiton.topia.TopiaContext)} */ protected static void initConvertersAndMatrixFactory() { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisTray.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisTray.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisTray.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -18,8 +18,8 @@ package fr.ifremer.isisfish; -import static org.codelutin.i18n.I18n._; -import static org.codelutin.i18n.I18n.n_; +import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; import java.awt.AWTException; import java.awt.SystemTray; @@ -31,7 +31,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.util.Resource; +import org.nuiton.util.Resource; import fr.ifremer.isisfish.simulator.SimulationControl; import fr.ifremer.isisfish.simulator.launcher.SimulationJob; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,7 +19,7 @@ package fr.ifremer.isisfish.actions; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.File; import java.util.ArrayList; @@ -29,8 +29,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.util.FileUtil; -import org.codelutin.util.ApplicationConfig.Action.Step; +import org.nuiton.util.FileUtil; +import org.nuiton.util.ApplicationConfig.Action.Step; import fr.ifremer.isisfish.IsisConfig; import fr.ifremer.isisfish.datastore.AnalysePlanStorage; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,11 +19,11 @@ package fr.ifremer.isisfish.actions; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.File; -import org.codelutin.util.FileUtil; +import org.nuiton.util.FileUtil; import fr.ifremer.isisfish.IsisConfig; import fr.ifremer.isisfish.datastore.AnalysePlanStorage; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,7 +19,7 @@ package fr.ifremer.isisfish.actions; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.File; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,7 +19,7 @@ package fr.ifremer.isisfish.actions; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.File; import java.io.FileInputStream; @@ -27,9 +27,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.util.FileUtil; -import org.codelutin.util.ZipUtil; -import org.codelutin.util.ApplicationConfig.Action.Step; +import org.nuiton.util.FileUtil; +import org.nuiton.util.ZipUtil; +import org.nuiton.util.ApplicationConfig.Action.Step; import fr.ifremer.isisfish.IsisConfig; import fr.ifremer.isisfish.IsisFish; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/AnalysePlanStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/AnalysePlanStorage.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/AnalysePlanStorage.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -26,7 +26,7 @@ import fr.ifremer.isisfish.util.Docable; import fr.ifremer.isisfish.vcs.VCSException; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import org.apache.commons.collections.map.ReferenceMap; import org.apache.commons.lang.ObjectUtils; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -22,7 +22,7 @@ import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.vcs.VCSException; -import org.codelutin.util.FileUtil; +import org.nuiton.util.FileUtil; import java.io.File; import java.io.IOException; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,7 +19,7 @@ package fr.ifremer.isisfish.datastore; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.File; import java.io.IOException; @@ -28,12 +28,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.TopiaContextFactory; -import org.codelutin.topia.TopiaException; -import org.codelutin.topia.TopiaNotFoundException; -import org.codelutin.util.FileUtil; -import org.codelutin.util.ZipUtil; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaContextFactory; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.TopiaNotFoundException; +import org.nuiton.util.FileUtil; +import org.nuiton.util.ZipUtil; import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.IsisFish; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,7 +19,7 @@ package fr.ifremer.isisfish.datastore; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.File; import java.lang.reflect.Field; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/FormuleStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/FormuleStorage.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/FormuleStorage.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -30,9 +30,9 @@ import org.apache.commons.collections.map.ReferenceMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.TopiaException; -import org.codelutin.util.FileUtil; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.util.FileUtil; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishDAOHelper; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -16,18 +16,19 @@ * ##% */ package fr.ifremer.isisfish.datastore; +import java.io.File; +import java.util.Properties; + +import org.hibernate.cfg.Environment; +import org.hibernate.dialect.H2Dialect; +import org.nuiton.topia.migration.TopiaMigrationServiceImpl; + import fr.ifremer.isisfish.IsisConfig; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishDAOHelper; import fr.ifremer.isisfish.datastore.migration.SwingMigrationCallbackHandler; -import org.codelutin.topia.migration.TopiaMigrationServiceImpl; -import org.hibernate.cfg.Environment; -import java.io.File; -import java.util.Properties; -import org.hibernate.dialect.H2Dialect; - /** * Isis H2 concrete Config implementation. * @@ -40,6 +41,9 @@ */ public class IsisH2Config { + /** Set in static field to be overriden by tests. Default to swing callback. */ + protected static Class<?> databaseMigrationClass = SwingMigrationCallbackHandler.class; + /*static { // http://www.h2database.com/javadoc/org/h2/constant/SysProperties.html#h2.lob… // Force lob storage in database instead of filesystem @@ -162,7 +166,7 @@ config.put(TopiaMigrationServiceImpl.MIGRATION_APPLICATION_VERSION, IsisConfig.getDatabaseVersion().toString()); config.put(TopiaMigrationServiceImpl.MIGRATION_PREVIOUS_MAPPING_DIRECTORY, "oldmappings"); config.put(TopiaMigrationServiceImpl.MIGRATION_MODEL_NAMES, "IsisFish"); - config.put(TopiaMigrationServiceImpl.MIGRATION_CALLBACKHANDLERS, SwingMigrationCallbackHandler.class.getName()); + config.put(TopiaMigrationServiceImpl.MIGRATION_CALLBACKHANDLERS, databaseMigrationClass.getName()); config.put("topia.service.migration", TopiaMigrationServiceImpl.class.getName()); return config; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,7 +19,7 @@ package fr.ifremer.isisfish.datastore; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.File; import java.io.PrintWriter; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -29,11 +29,11 @@ import org.apache.commons.lang.time.DateFormatUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import static org.codelutin.i18n.I18n._; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.TopiaException; -import org.codelutin.util.FileUtil; -import org.codelutin.util.ZipUtil; +import static org.nuiton.i18n.I18n._; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.util.FileUtil; +import org.nuiton.util.ZipUtil; import java.io.File; import java.io.IOException; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,7 +19,7 @@ package fr.ifremer.isisfish.datastore; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.util.ArrayList; import java.util.Arrays; @@ -31,13 +31,13 @@ import org.apache.commons.collections.map.ReferenceMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixFactory; -import org.codelutin.math.matrix.MatrixIterator; -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.TopiaException; -import org.codelutin.util.ArrayUtil; -import org.codelutin.util.HashList; +import org.nuiton.math.matrix.MatrixFactory; +import org.nuiton.math.matrix.MatrixIterator; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.util.ArrayUtil; +import org.nuiton.util.HashList; import fr.ifremer.isisfish.IsisFishDAOHelper; import fr.ifremer.isisfish.IsisFishException; @@ -617,7 +617,7 @@ } /* (non-Javadoc) - * @see fr.ifremer.isisfish.simulator.SimulationResultListener#addResult(fr.ifremer.isisfish.simulator.SimulationContext, fr.ifremer.isisfish.types.Date, java.lang.String, org.codelutin.math.matrix.MatrixND) + * @see fr.ifremer.isisfish.simulator.SimulationResultListener#addResult(fr.ifremer.isisfish.simulator.SimulationContext, fr.ifremer.isisfish.types.Date, java.lang.String, org.nuiton.math.matrix.MatrixND) */ public void addResult(SimulationContext context, Date date, String name, MatrixND mat) throws IsisFishException { try { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -27,7 +27,7 @@ import fr.ifremer.isisfish.rule.Rule; import fr.ifremer.isisfish.vcs.VCSException; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import org.apache.commons.collections.map.ReferenceMap; import org.apache.commons.lang.ObjectUtils; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -27,7 +27,7 @@ import fr.ifremer.isisfish.util.Docable; import fr.ifremer.isisfish.vcs.VCSException; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import org.apache.commons.collections.map.ReferenceMap; import org.apache.commons.logging.Log; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityStorage.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityStorage.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -25,7 +25,7 @@ import fr.ifremer.isisfish.util.Docable; import fr.ifremer.isisfish.vcs.VCSException; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import org.apache.commons.collections.map.ReferenceMap; import org.apache.commons.lang.ObjectUtils; @@ -149,7 +149,9 @@ result = SensitivityStorage.getParameterNames(calculator); } } catch (Exception eee) { - log.info(_("isisfish.error.sensitivity.parameter"), eee); + if (log.isErrorEnabled()) { + log.error(_("isisfish.error.source.parameter"), eee); + } } // si on ne reussi pas avec la classe compilé on essai en parsant le // source Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -18,7 +18,7 @@ package fr.ifremer.isisfish.datastore; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.File; import java.io.FileReader; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,7 +19,7 @@ package fr.ifremer.isisfish.datastore; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.File; import java.io.FileInputStream; @@ -33,10 +33,10 @@ import org.apache.commons.collections.map.ReferenceMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.TopiaException; -import org.codelutin.util.FileUtil; -import org.codelutin.util.ZipUtil; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.util.FileUtil; +import org.nuiton.util.ZipUtil; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishDAOHelper; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,7 +19,7 @@ package fr.ifremer.isisfish.datastore; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.File; import java.util.ArrayList; @@ -28,9 +28,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.util.FileUtil; -import org.codelutin.util.ListenerSet; -import org.codelutin.util.VersionNumber; +import org.nuiton.util.FileUtil; +import org.nuiton.util.ListenerSet; +import org.nuiton.util.VersionNumber; import fr.ifremer.isisfish.IsisConfig; import fr.ifremer.isisfish.IsisFish; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/SwingMigrationCallbackHandler.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/SwingMigrationCallbackHandler.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/SwingMigrationCallbackHandler.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -26,13 +26,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.migration.DatabaseManager; -import org.codelutin.topia.migration.callback.MigrationCallbackHandler; -import org.codelutin.util.VersionNumberUtil; +import org.nuiton.topia.migration.DatabaseManager; +import org.nuiton.topia.migration.callback.MigrationCallbackHandler; +import org.nuiton.util.VersionNumberUtil; - /** - * MigrationCallbackHandler + * MigrationCallbackHandler. * * @author chatellier * @version $Revision$ @@ -43,74 +42,120 @@ public class SwingMigrationCallbackHandler implements MigrationCallbackHandler { /** to use log facility, just put in your code: log.info("..."); */ - static private Log log = LogFactory.getLog(SwingMigrationCallbackHandler.class); + static private Log log = LogFactory + .getLog(SwingMigrationCallbackHandler.class); - /* (non-Javadoc) - * @see org.codelutin.topia.migration.callback.MigrationCallbackHandler#doMigration(java.lang.String, java.lang.String) + /* + * @see org.nuiton.topia.migration.callback.MigrationCallbackHandler#doMigration(java.lang.String, java.lang.String) */ @Override - public MigrationChoice doMigration(DatabaseManager dbManager, + public MigrationChoice doMigration(DatabaseManager dbManager, String dbVersion, String applicationVersion) { - - int answer = JOptionPane - .showConfirmDialog( - null, - "La base de donn\u00E9e est en version : " + dbVersion + - ".\n\nUne migration en version " + applicationVersion + - " est n\u00E9c\u00E9ssaire.\nVoulez vous migrer la base de donn\u00E9es ?", + + int answer = JOptionPane.showConfirmDialog( + null, "La base de donn\u00E9e est en version : " + dbVersion + + ".\n\nUne migration en version " + applicationVersion + + " est n\u00E9c\u00E9ssaire.\nVoulez vous migrer la base de donn\u00E9es ?", "Migration de base de donn\u00E9es", - JOptionPane.YES_NO_OPTION, - JOptionPane.QUESTION_MESSAGE - ); + JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); + + MigrationChoice result = (answer == JOptionPane.YES_OPTION) ? MigrationChoice.MIGRATION + : MigrationChoice.NO_MIGRATION; - MigrationChoice result = ( answer == JOptionPane.YES_OPTION ) ? MigrationChoice.MIGRATION : MigrationChoice.NO_MIGRATION; if (result == MigrationChoice.MIGRATION) { - // migration manuel sans l'aide de topia-service - // tant que c pas fait on dit non - result = MigrationChoice.NO_MIGRATION; - // ouverture d'une connexion direct JDBC sur la base + result = migrate(dbManager, dbVersion, applicationVersion); + } + return result; + } + + /** + * Perform real migration. + * + * @param dbManager + * @param dbVersion + * @param applicationVersion + * @return + */ + protected MigrationChoice migrate(DatabaseManager dbManager, + String dbVersion, String applicationVersion) { + // migration manuel sans l'aide de topia-service + // tant que c pas fait on dit non + MigrationChoice result = MigrationChoice.NO_MIGRATION; + // ouverture d'une connexion direct JDBC sur la base + try { + Connection conn = dbManager.getConnection(); try { - Connection conn = dbManager.getConnection(); - try { - conn.setAutoCommit(false); - if (VersionNumberUtil.smallerThan(dbVersion, "3.2")) { + conn.setAutoCommit(false); + if (VersionNumberUtil.smallerThan(dbVersion, "3.2")) { // on fait une migration vers 3.2 - migrateTo3_2(conn); - } + migrateTo3_2(conn); + } - // do same thing for other version - - // commit des modifs - conn.commit(); - // la migration a reussi, on dit que c fait - result = MigrationChoice.CUSTOM_MIGRATION; - } catch (Exception eee) { - // en cas d'erreur - log.error("Migration impossible de la base", eee); - // rollback du travail en cours - conn.rollback(); - } finally { - // close database connexion - conn.close(); + // do same thing for other version + if (VersionNumberUtil.smallerThan(dbVersion, "3.3")) { + // on fait une migration vers 3.2 + migrateTo3_3(conn); } + + // commit des modifs + conn.commit(); + // la migration a reussi, on dit que c fait + result = MigrationChoice.CUSTOM_MIGRATION; } catch (Exception eee) { - log.error("Error lors de la tentative de migration", eee); + // en cas d'erreur + log.error("Migration impossible de la base", eee); + // rollback du travail en cours + conn.rollback(); + } finally { + // close database connexion + conn.close(); } + } catch (Exception eee) { + log.error("Error lors de la tentative de migration", eee); } + return result; } - - private void migrateTo3_2(Connection conn) throws SQLException { + + protected void migrateTo3_2(Connection conn) throws SQLException { log.info("Migrate to version 3.2"); //alteration du schema // nouvelles equations dans les tables - String [] sqls = new String[]{ - "alter table SETOFVESSELS add column TECHNICALEFFICIENCYEQUATION VARCHAR(255);", - "alter table STRATEGY add column INACTIVITYEQUATIONUSED BIT default false;", - "alter table STRATEGY add column INACTIVITYEQUATION VARCHAR(255);", - "alter table STRATEGYMONTHINFO alter NUMBEROFTRIPS double;", - "alter table STRATEGYMONTHINFO alter MININACTIVITYDAYS double;", + String[] sqls = new String[] { + "alter table SETOFVESSELS add column TECHNICALEFFICIENCYEQUATION VARCHAR(255);", + "alter table STRATEGY add column INACTIVITYEQUATIONUSED BIT default false;", + "alter table STRATEGY add column INACTIVITYEQUATION VARCHAR(255);", + "alter table STRATEGYMONTHINFO alter NUMBEROFTRIPS double;", + "alter table STRATEGYMONTHINFO alter MININACTIVITYDAYS double;" }; + for (String sql : sqls) { + log.info("try " + sql); + PreparedStatement sta = conn.prepareStatement(sql); + sta.executeUpdate(); + log.info("done " + sql); + } + } + + protected void migrateTo3_3(Connection conn) throws SQLException { + log.info("Migrate to version 3.3"); + //alteration du schema + // nouvelles equations dans les tables + + String[] sqls = new String[] { + // replace in equation + "update EQUATION set content = replace(content, 'org.codelutin.', 'org.nuiton.');", + // replace in matrix semantics + "update POPULATION set recruitmentDistribution_semantics = replace(recruitmentDistribution_semantics, 'org.codelutin.', 'org.nuiton.') where recruitmentDistribution_semantics IS NOT null;", + "update POPULATION set mappingZoneReproZoneRecru_semantics = replace(mappingZoneReproZoneRecru_semantics, 'org.codelutin.', 'org.nuiton.') where mappingZoneReproZoneRecru_semantics IS NOT null;", + "update POPULATION set capturability_semantics = replace(capturability_semantics, 'org.codelutin.', 'org.nuiton.') where capturability_semantics IS NOT null;", + "update POPULATIONSEASONINFO set reproductionDistribution_semantics = replace(reproductionDistribution_semantics, 'org.codelutin.', 'org.nuiton.') where reproductionDistribution_semantics IS NOT null;", + "update POPULATIONSEASONINFO set lengthChangeMatrix_semantics = replace(lengthChangeMatrix_semantics, 'org.codelutin.', 'org.nuiton.') where lengthChangeMatrix_semantics IS NOT null;", + "update POPULATIONSEASONINFO set migrationMatrix_semantics = replace(migrationMatrix_semantics, 'org.codelutin.', 'org.nuiton.') where migrationMatrix_semantics IS NOT null;", + "update POPULATIONSEASONINFO set emigrationMatrix_semantics = replace(emigrationMatrix_semantics, 'org.codelutin.', 'org.nuiton.') where emigrationMatrix_semantics IS NOT null;", + "update POPULATIONSEASONINFO set immigrationMatrix_semantics = replace(immigrationMatrix_semantics, 'org.codelutin.', 'org.nuiton.') where immigrationMatrix_semantics IS NOT null;", + "update RESULT set matrix_semantics = replace(matrix_semantics, 'org.codelutin.', 'org.nuiton.') where matrix_semantics IS NOT null;", + "update STRATEGYMONTHINFO set proportionMetier_semantics = replace(proportionMetier_semantics, 'org.codelutin.', 'org.nuiton.') where proportionMetier_semantics IS NOT null;" + }; for (String sql : sqls) { log.info("try " + sql); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -31,7 +31,7 @@ package fr.ifremer.isisfish.datastore.update; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.BufferedInputStream; import java.io.BufferedReader; @@ -59,15 +59,15 @@ import org.apache.commons.lang.time.DurationFormatUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixFactory; -import org.codelutin.math.matrix.MatrixHelper; -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.persistence.TopiaEntity; -import org.codelutin.util.ArrayUtil; -import org.codelutin.util.FileUtil; -import org.codelutin.util.Resource; -import org.codelutin.util.VersionNumberUtil; +import org.nuiton.math.matrix.MatrixFactory; +import org.nuiton.math.matrix.MatrixHelper; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.util.ArrayUtil; +import org.nuiton.util.FileUtil; +import org.nuiton.util.Resource; +import org.nuiton.util.VersionNumberUtil; import org.dom4j.Document; import org.dom4j.Element; import org.dom4j.Node; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/EffortDescriptionImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/EffortDescriptionImpl.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/EffortDescriptionImpl.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -18,7 +18,7 @@ package fr.ifremer.isisfish.entities; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; /** * EffortDescriptionImpl. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/EquationImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/EquationImpl.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/EquationImpl.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,7 +19,7 @@ package fr.ifremer.isisfish.entities; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.util.HashMap; import java.util.Map; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/FisheryRegionImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/FisheryRegionImpl.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/FisheryRegionImpl.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -23,7 +23,7 @@ import java.util.ArrayList; import java.util.List; -import org.codelutin.topia.TopiaException; +import org.nuiton.topia.TopiaException; import fr.ifremer.isisfish.IsisFishDAOHelper; import fr.ifremer.isisfish.IsisFishRuntimeException; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,7 +19,7 @@ package fr.ifremer.isisfish.entities; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.util.ArrayList; import java.util.List; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,7 +19,7 @@ package fr.ifremer.isisfish.entities; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,8 +19,8 @@ package fr.ifremer.isisfish.entities; -import static org.codelutin.i18n.I18n._; -import static org.codelutin.i18n.I18n.n_; +import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; import java.util.Arrays; import java.util.Collection; @@ -28,11 +28,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixException; -import org.codelutin.math.matrix.MatrixFactory; -import org.codelutin.math.matrix.MatrixIterator; -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.topia.TopiaException; +import org.nuiton.math.matrix.MatrixException; +import org.nuiton.math.matrix.MatrixFactory; +import org.nuiton.math.matrix.MatrixIterator; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.topia.TopiaException; import fr.ifremer.isisfish.IsisFishDAOHelper; import fr.ifremer.isisfish.IsisFishRuntimeException; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,8 +19,8 @@ package fr.ifremer.isisfish.entities; -import static org.codelutin.i18n.I18n._; -import static org.codelutin.i18n.I18n.n_; +import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; import java.util.ArrayList; import java.util.Arrays; @@ -28,11 +28,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixFactory; -import org.codelutin.math.matrix.MatrixHelper; -import org.codelutin.math.matrix.MatrixIterator; -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.topia.TopiaException; +import org.nuiton.math.matrix.MatrixFactory; +import org.nuiton.math.matrix.MatrixHelper; +import org.nuiton.math.matrix.MatrixIterator; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.topia.TopiaException; import fr.ifremer.isisfish.IsisFishDAOHelper; import fr.ifremer.isisfish.IsisFishRuntimeException; @@ -449,7 +449,7 @@ } /* (non-Javadoc) - * @see fr.ifremer.isisfish.entities.PopulationSeasonInfo#getMigrationMatrix(fr.ifremer.isisfish.types.Month, org.codelutin.math.matrix.MatrixND) + * @see fr.ifremer.isisfish.entities.PopulationSeasonInfo#getMigrationMatrix(fr.ifremer.isisfish.types.Month, org.nuiton.math.matrix.MatrixND) */ public MatrixND getMigrationMatrix(Month month, MatrixND N) { if (month.getMonthNumber() == getFirstMonth().getMonthNumber()) { @@ -545,7 +545,7 @@ } /* (non-Javadoc) - * @see fr.ifremer.isisfish.entities.PopulationSeasonInfo#getEmigrationMatrix(fr.ifremer.isisfish.types.Month, org.codelutin.math.matrix.MatrixND) + * @see fr.ifremer.isisfish.entities.PopulationSeasonInfo#getEmigrationMatrix(fr.ifremer.isisfish.types.Month, org.nuiton.math.matrix.MatrixND) */ public MatrixND getEmigrationMatrix(Month month, MatrixND N) { if (month.getMonthNumber() == getFirstMonth().getMonthNumber()) { @@ -613,7 +613,7 @@ } /* (non-Javadoc) - * @see fr.ifremer.isisfish.entities.PopulationSeasonInfo#getImmigrationMatrix(fr.ifremer.isisfish.types.Month, org.codelutin.math.matrix.MatrixND) + * @see fr.ifremer.isisfish.entities.PopulationSeasonInfo#getImmigrationMatrix(fr.ifremer.isisfish.types.Month, org.nuiton.math.matrix.MatrixND) */ public MatrixND getImmigrationMatrix(Month month, MatrixND N) { if (month.getMonthNumber() == getFirstMonth().getMonthNumber()) { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SeasonImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SeasonImpl.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SeasonImpl.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -23,7 +23,7 @@ import java.util.List; import fr.ifremer.isisfish.types.Month; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; /*** * SeasonImpl. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SelectivityImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SelectivityImpl.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SelectivityImpl.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,7 +19,7 @@ package fr.ifremer.isisfish.entities; -import org.codelutin.topia.TopiaException; +import org.nuiton.topia.TopiaException; import fr.ifremer.isisfish.IsisFishDAOHelper; import fr.ifremer.isisfish.IsisFishRuntimeException; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,11 +19,11 @@ package fr.ifremer.isisfish.entities; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.TopiaException; +import org.nuiton.topia.TopiaException; import fr.ifremer.isisfish.IsisFishDAOHelper; import fr.ifremer.isisfish.IsisFishRuntimeException; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,14 +19,14 @@ package fr.ifremer.isisfish.entities; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.util.ArrayList; import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.TopiaException; +import org.nuiton.topia.TopiaException; import fr.ifremer.isisfish.IsisFishDAOHelper; import fr.ifremer.isisfish.IsisFishRuntimeException; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,7 +19,7 @@ package fr.ifremer.isisfish.entities; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.util.ArrayList; import java.util.Collection; @@ -27,8 +27,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixFactory; -import org.codelutin.math.matrix.MatrixND; +import org.nuiton.math.matrix.MatrixFactory; +import org.nuiton.math.matrix.MatrixND; import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.datastore.RegionStorage; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/TargetSpeciesImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/TargetSpeciesImpl.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/TargetSpeciesImpl.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,11 +19,11 @@ package fr.ifremer.isisfish.entities; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.TopiaException; +import org.nuiton.topia.TopiaException; import fr.ifremer.isisfish.IsisFishDAOHelper; import fr.ifremer.isisfish.IsisFishRuntimeException; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/TripTypeImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/TripTypeImpl.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/TripTypeImpl.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,7 +19,7 @@ package fr.ifremer.isisfish.entities; -import org.codelutin.topia.TopiaException; +import org.nuiton.topia.TopiaException; import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.datastore.RegionStorage; @@ -43,7 +43,7 @@ private static final long serialVersionUID = 1L; /* (non-Javadoc) - * @see org.codelutin.topia.persistence.TopiaEntityAbstract#postCreate() + * @see org.nuiton.topia.persistence.TopiaEntityAbstract#postCreate() */ @Override public void postCreate() throws TopiaException { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/VesselTypeImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/VesselTypeImpl.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/VesselTypeImpl.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,7 +19,7 @@ package fr.ifremer.isisfish.entities; -import org.codelutin.topia.TopiaException; +import org.nuiton.topia.TopiaException; import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.datastore.RegionStorage; @@ -43,7 +43,7 @@ private static final long serialVersionUID = 1L; /* (non-Javadoc) - * @see org.codelutin.topia.persistence.TopiaEntityAbstract#postCreate() + * @see org.nuiton.topia.persistence.TopiaEntityAbstract#postCreate() */ @Override public void postCreate() throws TopiaException { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/EmigrationEquation.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/EmigrationEquation.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/EmigrationEquation.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -31,7 +31,7 @@ package fr.ifremer.isisfish.equation; -import org.codelutin.math.matrix.MatrixND; +import org.nuiton.math.matrix.MatrixND; import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.PopulationGroup; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/ImmigrationEquation.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/ImmigrationEquation.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/ImmigrationEquation.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -31,7 +31,7 @@ package fr.ifremer.isisfish.equation; -import org.codelutin.math.matrix.MatrixND; +import org.nuiton.math.matrix.MatrixND; import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.PopulationGroup; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/MigrationEquation.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/MigrationEquation.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/MigrationEquation.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -31,7 +31,7 @@ package fr.ifremer.isisfish.equation; -import org.codelutin.math.matrix.MatrixND; +import org.nuiton.math.matrix.MatrixND; import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.PopulationGroup; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationReproductionEquation.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationReproductionEquation.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationReproductionEquation.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -33,7 +33,7 @@ import java.util.List; -import org.codelutin.math.matrix.MatrixND; +import org.nuiton.math.matrix.MatrixND; import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.PopulationGroup; @@ -69,14 +69,14 @@ @Args({"context", "N", "pop", "month", "prepro", "zoneRepro", "groups", "zones", "result"}) @ArgTypes({ "fr.ifremer.isisfish.simulator.SimulationContext", - "org.codelutin.math.matrix.MatrixND", + "org.nuiton.math.matrix.MatrixND", "fr.ifremer.isisfish.entities.Population", "fr.ifremer.isisfish.types.Month", "double", "java.util.List<Zone>", "java.util.List<PopulationGroup>", "java.util.List<Zone>", - "org.codelutin.math.matrix.MatrixND"}) + "org.nuiton.math.matrix.MatrixND"}) public double compute(SimulationContext context, MatrixND N, Population pop, Month month, double prepro, List<Zone> zoneRepro, List<PopulationGroup> groups, List<Zone> zones, Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -30,8 +30,8 @@ import org.apache.commons.beanutils.ConvertUtilsBean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.persistence.TopiaEntity; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.persistence.TopiaEntity; import fr.ifremer.isisfish.datastore.ExportStorage; import fr.ifremer.isisfish.datastore.SensitivityExportStorage; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -30,7 +30,7 @@ import org.apache.log4j.Level; import org.apache.log4j.Logger; import org.apache.log4j.PatternLayout; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.File; import java.io.IOException; @@ -86,7 +86,7 @@ /** les catégories rattachées au logger de librairies. */ private static final String[] libLoggerToChange = { - "org.codelutin" + "org.nuiton" }; /** 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-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -21,9 +21,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import static org.codelutin.i18n.I18n._; -import org.codelutin.widget.IconFactory; -import org.codelutin.log.LutinLogFactory; +import static org.nuiton.i18n.I18n._; +import org.nuiton.widget.IconFactory; +import org.nuiton.log.LutinLogFactory; import javax.swing.*; import javax.swing.event.ChangeEvent; 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-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleHandler.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -29,8 +29,8 @@ import fr.ifremer.isisfish.logging.io.MemoryOffsetReader; import org.apache.commons.logging.Log; import static org.apache.commons.logging.LogFactory.getLog; -import static org.codelutin.i18n.I18n._; -import org.codelutin.widget.StatusBar; +import static org.nuiton.i18n.I18n._; +import org.nuiton.widget.StatusBar; import javax.swing.*; import java.awt.event.AdjustmentEvent; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -18,7 +18,7 @@ * ##% */ package fr.ifremer.isisfish.logging.console; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -52,9 +52,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.util.FileUtil; -import org.codelutin.util.ZipUtil; -import org.codelutin.widget.StatusBar; +import org.nuiton.util.FileUtil; +import org.nuiton.util.ZipUtil; +import org.nuiton.widget.StatusBar; import fr.ifremer.isisfish.ui.logging.console.LogMailUI; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/CellSelectionLayer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/CellSelectionLayer.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/CellSelectionLayer.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -23,7 +23,7 @@ import java.util.ArrayList; import java.util.List; -import org.codelutin.topia.TopiaException; +import org.nuiton.topia.TopiaException; import com.bbn.openmap.LatLonPoint; import com.bbn.openmap.event.MapMouseListener; 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-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,7 +19,7 @@ package fr.ifremer.isisfish.map; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.util.ArrayList; import java.util.Arrays; @@ -28,9 +28,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.TopiaException; -import org.codelutin.util.Resource; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.util.Resource; import com.bbn.openmap.BufferedMapBean; import com.bbn.openmap.LatLonPoint; 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-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/ResultatLayer.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -18,7 +18,7 @@ package fr.ifremer.isisfish.map; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.awt.Color; import java.awt.Component; @@ -33,7 +33,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixND; +import org.nuiton.math.matrix.MatrixND; import com.bbn.openmap.LatLonPoint; import com.bbn.openmap.event.MapMouseListener; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -24,11 +24,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.TopiaException; -import org.codelutin.topia.event.TopiaTransactionEvent; -import org.codelutin.topia.event.TopiaTransactionListener; -import org.codelutin.topia.persistence.TopiaEntity; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.event.TopiaTransactionEvent; +import org.nuiton.topia.event.TopiaTransactionListener; +import org.nuiton.topia.persistence.TopiaEntity; import com.bbn.openmap.Layer; import com.bbn.openmap.event.ProjectionEvent; @@ -197,7 +197,7 @@ } /* - * @see org.codelutin.topia.event.TopiaTransactionListener#commit(org.codelutin.topia.event.TopiaTransactionEvent) + * @see org.nuiton.topia.event.TopiaTransactionListener#commit(org.nuiton.topia.event.TopiaTransactionEvent) */ @Override public void commit(TopiaTransactionEvent event) { @@ -212,7 +212,7 @@ } /* - * @see org.codelutin.topia.event.TopiaTransactionListener#rollback(org.codelutin.topia.event.TopiaTransactionEvent) + * @see org.nuiton.topia.event.TopiaTransactionListener#rollback(org.nuiton.topia.event.TopiaTransactionEvent) */ @Override public void rollback(TopiaTransactionEvent event) { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -21,7 +21,7 @@ import java.io.File; import java.io.IOException; -import org.codelutin.topia.TopiaContext; +import org.nuiton.topia.TopiaContext; import org.dom4j.Document; import org.dom4j.DocumentException; import org.dom4j.Element; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -21,8 +21,8 @@ import java.util.List; import org.apache.commons.beanutils.ConvertUtilsBean; -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.topia.TopiaContext; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.topia.TopiaContext; import org.dom4j.Element; import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/rule/RuleHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/rule/RuleHelper.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/rule/RuleHelper.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -25,8 +25,8 @@ import org.apache.commons.beanutils.ConvertUtilsBean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.persistence.TopiaEntity; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.persistence.TopiaEntity; import fr.ifremer.isisfish.datastore.RegionStorage; import fr.ifremer.isisfish.datastore.RuleStorage; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/MetierMonitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/MetierMonitor.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/MetierMonitor.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,7 +19,7 @@ package fr.ifremer.isisfish.simulator; -import static org.codelutin.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n_; import java.util.ArrayList; import java.util.Collection; @@ -34,10 +34,10 @@ import org.apache.commons.collections.map.MultiKeyMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixFactory; -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.TopiaException; +import org.nuiton.math.matrix.MatrixFactory; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.entities.Metier; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -26,9 +26,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixFactory; -import org.codelutin.math.matrix.MatrixIterator; -import org.codelutin.math.matrix.MatrixND; +import org.nuiton.math.matrix.MatrixFactory; +import org.nuiton.math.matrix.MatrixIterator; +import org.nuiton.math.matrix.MatrixND; import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.PopulationGroup; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -31,7 +31,7 @@ package fr.ifremer.isisfish.simulator; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.util.Collection; import java.util.HashSet; @@ -41,7 +41,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixND; +import org.nuiton.math.matrix.MatrixND; import fr.ifremer.isisfish.IsisFishException; import fr.ifremer.isisfish.datastore.ExportStorage; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -27,8 +27,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.TopiaException; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; import fr.ifremer.isisfish.datastore.SimulationStorage; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationMeta.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationMeta.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationMeta.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -5,7 +5,7 @@ import fr.ifremer.isisfish.ui.widget.filter.FilterParamModel; import fr.ifremer.isisfish.ui.widget.filter.ValueGetter; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -18,7 +18,7 @@ package fr.ifremer.isisfish.simulator; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.File; import java.lang.reflect.Field; @@ -37,14 +37,14 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixFactory; -import org.codelutin.math.matrix.MatrixHelper; -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.TopiaException; -import org.codelutin.topia.persistence.TopiaEntity; -import org.codelutin.util.SortedProperties; -import org.codelutin.util.StringUtil; +import org.nuiton.math.matrix.MatrixFactory; +import org.nuiton.math.matrix.MatrixHelper; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.util.SortedProperties; +import org.nuiton.util.StringUtil; import fr.ifremer.isisfish.IsisConfig; import fr.ifremer.isisfish.IsisFishDAOHelper; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScript.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScript.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScript.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,9 +19,9 @@ package fr.ifremer.isisfish.simulator; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; -import org.codelutin.topia.TopiaContext; +import org.nuiton.topia.TopiaContext; import fr.ifremer.isisfish.datastore.SimulationStorage; @@ -68,8 +68,8 @@ Interpreter bsh = new Interpreter(); bsh.set("context", context); bsh.set("db", tx); - bsh.eval("import org.codelutin.topia.*;"); - bsh.eval("import org.codelutin.topia.persistence.*;"); + bsh.eval("import org.nuiton.topia.*;"); + bsh.eval("import org.nuiton.topia.persistence.*;"); bsh.eval("import fr.ifremer.isisfish.*;"); bsh.eval("import java.util.*;"); bsh.eval("import fr.ifremer.isisfish.types.*;"); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -1,6 +1,6 @@ package fr.ifremer.isisfish.simulator; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import fr.ifremer.isisfish.datastore.SimulationStorage; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultGetter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultGetter.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultGetter.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -31,7 +31,7 @@ package fr.ifremer.isisfish.simulator; -import org.codelutin.math.matrix.MatrixND; +import org.nuiton.math.matrix.MatrixND; import fr.ifremer.isisfish.types.Date; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultListener.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultListener.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultListener.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -31,7 +31,7 @@ package fr.ifremer.isisfish.simulator; -import org.codelutin.math.matrix.MatrixND; +import org.nuiton.math.matrix.MatrixND; import fr.ifremer.isisfish.IsisFishException; import fr.ifremer.isisfish.types.Date; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultXML.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultXML.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultXML.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -39,9 +39,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixIterator; -import org.codelutin.math.matrix.MatrixND; -import static org.codelutin.i18n.I18n._; +import org.nuiton.math.matrix.MatrixIterator; +import org.nuiton.math.matrix.MatrixND; +import static org.nuiton.i18n.I18n._; import fr.ifremer.isisfish.IsisFishException; import fr.ifremer.isisfish.datastore.SimulationStorage; @@ -145,7 +145,7 @@ } /* (non-Javadoc) - * @see fr.ifremer.isisfish.simulator.SimulationResultListener#addResult(fr.ifremer.isisfish.simulator.SimulationContext, fr.ifremer.isisfish.types.Date, java.lang.String, org.codelutin.math.matrix.MatrixND) + * @see fr.ifremer.isisfish.simulator.SimulationResultListener#addResult(fr.ifremer.isisfish.simulator.SimulationContext, fr.ifremer.isisfish.types.Date, java.lang.String, org.nuiton.math.matrix.MatrixND) */ public void addResult(SimulationContext context, Date date, String name, MatrixND mat) throws IsisFishException { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulatorServer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulatorServer.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulatorServer.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,7 +19,7 @@ package fr.ifremer.isisfish.simulator; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.File; import java.io.IOException; @@ -38,7 +38,7 @@ import org.apache.xmlrpc.server.XmlRpcNoSuchHandlerException; import org.apache.xmlrpc.server.XmlRpcServer; import org.apache.xmlrpc.webserver.WebServer; -import org.codelutin.util.FileUtil; +import org.nuiton.util.FileUtil; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.datastore.SimulationStorage; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,7 +19,7 @@ package fr.ifremer.isisfish.simulator.launcher; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.File; import java.net.MalformedURLException; @@ -33,14 +33,14 @@ import org.apache.commons.lang.time.DurationFormatUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.TopiaException; -import org.codelutin.topia.event.TopiaTransactionEvent; -import org.codelutin.topia.event.TopiaTransactionListener; -import org.codelutin.topia.persistence.TopiaEntity; -import org.codelutin.util.FileUtil; -import org.codelutin.util.ObjectUtil; -import org.codelutin.util.StringUtil; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.event.TopiaTransactionEvent; +import org.nuiton.topia.event.TopiaTransactionListener; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.util.FileUtil; +import org.nuiton.util.ObjectUtil; +import org.nuiton.util.StringUtil; import fr.ifremer.isisfish.IsisConfig; import fr.ifremer.isisfish.IsisFish; @@ -518,7 +518,7 @@ } /* - * @see org.codelutin.topia.event.TopiaTransactionListener#commit(org.codelutin.topia.event.TopiaTransactionEvent) + * @see org.nuiton.topia.event.TopiaTransactionListener#commit(org.nuiton.topia.event.TopiaTransactionEvent) */ public void commit(TopiaTransactionEvent event) { // rien a faire, car normalement toujours rollback en fin de mois @@ -526,7 +526,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.event.TopiaTransactionListener#rollback(org.codelutin.topia.event.TopiaTransactionEvent) + * @see org.nuiton.topia.event.TopiaTransactionListener#rollback(org.nuiton.topia.event.TopiaTransactionEvent) */ public void rollback(TopiaTransactionEvent event) { log.debug("Transaction rollback " + event.getEntities().size() Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/IsisFishServerSimulationLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/IsisFishServerSimulationLauncher.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/IsisFishServerSimulationLauncher.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,7 +19,7 @@ package fr.ifremer.isisfish.simulator.launcher; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.File; import java.net.URL; @@ -32,7 +32,7 @@ import org.apache.xmlrpc.client.XmlRpcClient; import org.apache.xmlrpc.client.XmlRpcClientConfigImpl; import org.apache.xmlrpc.client.XmlRpcCommonsTransportFactory; -import org.codelutin.util.FileUtil; +import org.nuiton.util.FileUtil; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.datastore.SimulationStorage; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -18,7 +18,7 @@ package fr.ifremer.isisfish.simulator.launcher; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.BufferedOutputStream; import java.io.File; @@ -43,8 +43,8 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.util.FileUtil; -import org.codelutin.util.MD5; +import org.nuiton.util.FileUtil; +import org.nuiton.util.MD5; import com.jcraft.jsch.JSch; import com.jcraft.jsch.JSchException; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationExecutor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationExecutor.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationExecutor.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -21,7 +21,7 @@ import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.util.concurrent.BlockingQueue; import java.util.concurrent.ThreadPoolExecutor; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,7 +19,7 @@ package fr.ifremer.isisfish.simulator.launcher; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.File; import java.rmi.RemoteException; @@ -29,7 +29,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.util.FileUtil; +import org.nuiton.util.FileUtil; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.simulator.SimulationControl; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -18,7 +18,7 @@ package fr.ifremer.isisfish.simulator.launcher; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.File; import java.io.FileInputStream; @@ -42,7 +42,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.util.FileUtil; +import org.nuiton.util.FileUtil; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishException; 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-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,7 +19,7 @@ package fr.ifremer.isisfish.simulator.launcher; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; @@ -48,12 +48,12 @@ import org.apache.commons.lang.time.DurationFormatUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.TopiaException; -import org.codelutin.util.FileUtil; -import org.codelutin.util.ListenerSet; -import org.codelutin.util.ObjectUtil; -import org.codelutin.util.ZipUtil; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.util.FileUtil; +import org.nuiton.util.ListenerSet; +import org.nuiton.util.ObjectUtil; +import org.nuiton.util.ZipUtil; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishRuntimeException; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,7 +19,7 @@ package fr.ifremer.isisfish.simulator.launcher; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import fr.ifremer.isisfish.simulator.SimulationControl; import fr.ifremer.isisfish.simulator.SimulationParameter; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,7 +19,7 @@ package fr.ifremer.isisfish.simulator.launcher; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.BufferedReader; import java.io.File; @@ -34,7 +34,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.util.FileUtil; +import org.nuiton.util.FileUtil; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.datastore.SimulationStorage; 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-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -25,9 +25,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.j2r.REngine; -import org.codelutin.j2r.RException; -import org.codelutin.j2r.RProxy; +import org.nuiton.j2r.REngine; +import org.nuiton.j2r.RException; +import org.nuiton.j2r.RProxy; import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -20,8 +20,8 @@ import java.io.Serializable; -import org.codelutin.math.matrix.MapFunction; -import org.codelutin.math.matrix.MatrixND; +import org.nuiton.math.matrix.MapFunction; +import org.nuiton.math.matrix.MatrixND; /** * Domaine continu portant sur une matrice. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/Date.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/Date.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/Date.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -32,7 +32,7 @@ package fr.ifremer.isisfish.types; import java.io.Serializable; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; /** * This object can't be modified. If this beaviour is modified pay attention Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/Month.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/Month.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/Month.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -21,7 +21,7 @@ package fr.ifremer.isisfish.types; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.Serializable; import java.util.ArrayList; @@ -120,7 +120,7 @@ } /* - * @see org.codelutin.topia.persistence.TopiaEntityAbstract#equals(java.lang.Object) + * @see org.nuiton.topia.persistence.TopiaEntityAbstract#equals(java.lang.Object) */ @Override public boolean equals(Object o) { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/TimeUnit.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/TimeUnit.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/TimeUnit.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -31,7 +31,7 @@ package fr.ifremer.isisfish.types; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.Serializable; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -41,11 +41,11 @@ import org.apache.commons.beanutils.ConvertUtilsBean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixFactory; -import org.codelutin.math.matrix.MatrixHelper; -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.topia.persistence.TopiaEntity; -import org.codelutin.util.StringUtil; +import org.nuiton.math.matrix.MatrixFactory; +import org.nuiton.math.matrix.MatrixHelper; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.util.StringUtil; import org.hibernate.Hibernate; import org.hibernate.HibernateException; import org.hibernate.engine.SessionImplementor; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/ApplicationMonitorUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/ApplicationMonitorUI.jaxx 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/ApplicationMonitorUI.jaxx 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,7 +19,7 @@ --> <JFrame visible="true" size='{new Dimension(400,400)}' title="isisfish.monitor.title" layout='{new BorderLayout()}'> - <org.codelutin.widget.ApplicationMonitor + <org.nuiton.widget.ApplicationMonitor smtpServer="fr.ifremer.isisfish.IsisConfig.getSmtpServer()" emailFrom="fr.ifremer.isisfish.IsisConfig.getUserMail()" emailTo="fr.ifremer.isisfish.IsisConfig.BUG_REPORT_EMAIL" Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/Help.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/Help.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/Help.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -50,8 +50,8 @@ URLSALIAS.put("ISISFISH", "http://isis-fish.labs.libre-entreprise.org/"); URLSALIAS.put("JAVA_API", "http://java.sun.com/javase/6/docs/api/index.html"); URLSALIAS.put("ISIS_API", "http://isis-fish.labs.libre-entreprise.org/isis-fish/apidocs/index.html"); - URLSALIAS.put("MATRIX_API", "http://lutinmatrix.labs.libre-entreprise.org/lutinmatrix/apidocs/index.html"); - URLSALIAS.put("TOPIA_API", "http://topia.labs.libre-entreprise.org/topia/topia-persistence/apidocs/inde…"); + URLSALIAS.put("MATRIX_API", "http://maven-site.nuiton.org/nuiton-matrix/apidocs/index.html"); + URLSALIAS.put("TOPIA_API", "http://maven-site.nuiton.org/topia/topia-persistence/apidocs/index.html"); } /** Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx 2009-10-13 15:00:50 UTC (rev 2658) @@ -54,7 +54,7 @@ toolTipText="Stop the process" /> </cell> --> <cell fill="both"> - <org.codelutin.widget.StatusBar /> + <org.nuiton.widget.StatusBar /> </cell> </row> </Table> \ No newline at end of file Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,7 +19,7 @@ --> <JFrame title="isisfish.welcome.title" width='874' height='736' resizable="true" layout='{new BorderLayout()}'> <script><![CDATA[ - import static org.codelutin.i18n.I18n._; + import static org.nuiton.i18n.I18n._; import javax.swing.JFrame; import fr.ifremer.isisfish.IsisFish; @@ -37,7 +37,7 @@ import fr.ifremer.isisfish.ui.config.ConfigUI; import fr.ifremer.isisfish.ui.config.SSHLauncherConfigUI; import fr.ifremer.isisfish.ui.vcs.VCSConfigUI; - import org.codelutin.widget.AboutFrame; + import org.nuiton.widget.AboutFrame; import jaxx.runtime.DefaultJAXXContext; import jaxx.runtime.JAXXInitialContext; @@ -94,13 +94,13 @@ protected void config() { ConfigUI configUI = new ConfigUI(); configUI.pack(); - org.codelutin.widget.SwingUtil.center(configUI); + org.nuiton.widget.SwingUtil.center(configUI); configUI.setVisible(true); } protected void configVCS() { VCSConfigUI vcsConfig = new VCSConfigUI(); vcsConfig.pack(); - org.codelutin.widget.SwingUtil.center(vcsConfig); + org.nuiton.widget.SwingUtil.center(vcsConfig); vcsConfig.setVisible(true); } @@ -108,7 +108,7 @@ SSHLauncherConfigUI configUI = new SSHLauncherConfigUI(); configUI.pack(); configUI.setSize(600, configUI.getHeight()); - org.codelutin.widget.SwingUtil.center(configUI); + org.nuiton.widget.SwingUtil.center(configUI); configUI.setVisible(true); } @@ -127,7 +127,7 @@ about.setLicenseText(_("isisfish.about.licensetext")); about.setBackgroundColor(Color.WHITE); about.setSize(640, 520); - org.codelutin.widget.SwingUtil.center(about); + org.nuiton.widget.SwingUtil.center(about); about.setVisible(true); } ]]> @@ -157,7 +157,7 @@ <JMenu text="isisfish.welcome.menu.api"> <JMenuItem text="isisfish.welcome.menu.help.javaapi" onActionPerformed='help("JAVA_API")'/> <JMenuItem text="isisfish.welcome.menu.help.isisfishapi" onActionPerformed='help("ISIS_API")'/> - <JMenuItem text="isisfish.welcome.menu.help.lutinmatrixapi" onActionPerformed='help("MATRIX_API")'/> + <JMenuItem text="isisfish.welcome.menu.help.matrixapi" onActionPerformed='help("MATRIX_API")'/> <JMenuItem text="isisfish.welcome.menu.help.topiaapi" onActionPerformed='help("TOPIA_API")'/> </JMenu> <JSeparator/> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/config/IsisConfigTableModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/config/IsisConfigTableModel.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/config/IsisConfigTableModel.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -18,7 +18,7 @@ package fr.ifremer.isisfish.ui.config; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import javax.swing.table.AbstractTableModel; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CopyMapToClipboardListener.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CopyMapToClipboardListener.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CopyMapToClipboardListener.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -18,7 +18,7 @@ package fr.ifremer.isisfish.ui.input; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.awt.Graphics; import java.awt.GraphicsEnvironment; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx 2009-10-13 15:00:50 UTC (rev 2658) @@ -20,9 +20,9 @@ <JDialog id="EquationEditorPane" modal="true" title="isisfish.equation.editor.title" width="400" height="400"> <script><![CDATA[ -import org.codelutin.widget.editor.Editor; +import org.nuiton.widget.editor.Editor; import fr.ifremer.isisfish.util.CompileHelper; -import org.codelutin.util.FileUtil; +import org.nuiton.util.FileUtil; import javax.swing.text.html.HTMLEditorKit; import javax.swing.text.html.HTMLDocument; import javax.swing.event.HyperlinkListener; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,13 +19,10 @@ package fr.ifremer.isisfish.ui.input; -import static fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil.selectSimulation; -import static javax.swing.JOptionPane.showInputDialog; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.awt.geom.Point2D; import java.io.File; -import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -34,20 +31,14 @@ import javax.swing.JScrollPane; import javax.swing.JTextArea; -import jaxx.runtime.swing.ErrorDialogUI; - -import org.apache.commons.beanutils.MethodUtils; -import org.apache.commons.lang.ClassUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixFactory; -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.TopiaException; -import org.codelutin.topia.persistence.TopiaDAO; -import org.codelutin.topia.persistence.TopiaEntity; -import org.codelutin.util.FileUtil; -import org.codelutin.widget.editor.Editor; +import org.nuiton.math.matrix.MatrixFactory; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.util.FileUtil; +import org.nuiton.widget.editor.Editor; import com.bbn.openmap.layer.shape.SpatialIndex; @@ -61,7 +52,6 @@ import fr.ifremer.isisfish.entities.CellDAO; import fr.ifremer.isisfish.entities.EffortDescription; import fr.ifremer.isisfish.entities.EffortDescriptionDAO; -import fr.ifremer.isisfish.entities.Equation; import fr.ifremer.isisfish.entities.FisheryRegion; import fr.ifremer.isisfish.entities.Formule; import fr.ifremer.isisfish.entities.Gear; @@ -86,6 +76,8 @@ import fr.ifremer.isisfish.ui.input.check.CheckRegion; import fr.ifremer.isisfish.ui.input.check.CheckResult; import fr.ifremer.isisfish.ui.input.check.CheckResultFrame; +import fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil; +import fr.ifremer.isisfish.ui.util.ErrorHelper; import fr.ifremer.isisfish.util.CellPointcomparator; /** @@ -105,19 +97,13 @@ private static Log log = LogFactory.getLog(InputAction.class); public InputAction() { - if (log.isDebugEnabled()) { - log.debug("new instance"); - } - } - protected void showMsgBox(Exception eee) { - ErrorDialogUI.showError(eee); } /** - * Exporter la region dans un zip + * Exporter la region dans un zip. * - * @return TODO + * @return le nom du ficher selectionné par l'utilisateur */ public File importRegion() { File file = null; @@ -127,19 +113,19 @@ if (file != null) { RegionStorage.importZip(file); } - } catch (Exception e) { + } catch (Exception eee) { if (log.isErrorEnabled()) { - log.error("Can't import region", e); + log.error("Can't import region", eee); } - showMsgBox(e); + ErrorHelper.showErrorDialog(_("isisfish.error.region.import"), eee); } return file; } /** - * Exporter la region dans un zip + * Exporter la region dans un zip. * - * @return TODO + * @return le nom du ficher selectionné par l'utilisateur */ public File importRegionAndRename() { File file = null; @@ -148,22 +134,22 @@ _("isisfish.message.import.region.zipped")); if (file != null) { - String newName = showInputDialog(_("isisfish.message.name.imported.region")); + String newName = JOptionPane.showInputDialog(_("isisfish.message.name.imported.region")); RegionStorage.importAndRenameZip(file, newName); } } catch (Exception eee) { if (log.isErrorEnabled()) { log.error("Can't import region", eee); } - showMsgBox(eee); + ErrorHelper.showErrorDialog(_("isisfish.error.region.import"), eee); } return file; } /** - * Importer la region depuis un fichier XML de la version 2 + * Importer la region depuis un fichier XML de la version 2. * - * @return TODO + * @return le nom du ficher selectionné par l'utilisateur */ public File importV2Region() { File file = null; @@ -171,15 +157,13 @@ file = FileUtil.getFile(".*.xml$", _("isisfish.message.import.region.xml")); if (file != null) { - new ImportFromV2(true).importXML(file); - } } catch (Exception eee) { if (log.isErrorEnabled()) { log.error("Can't import region", eee); } - showMsgBox(eee); + ErrorHelper.showErrorDialog(_("isisfish.error.region.import"), eee); } return file; } @@ -188,7 +172,7 @@ * Extract from a simulation the region, and rename it with name given * by user. * - * @return msg + * @return le nom de la region entré par l'utilsateur */ public String importRegionFromSimulation() { @@ -196,18 +180,18 @@ String simulationName; try { //TODO Should use a shared model ? - simulationName = selectSimulation(SimulationStorage + simulationName = SimulationFilterUtil.selectSimulation(SimulationStorage .getSimulationNames()); if (simulationName == null) { return null; } - } catch (Exception e) { + } catch (Exception eee) { String msg = _("isisfish.error.no.select.simulation"); if (log.isWarnEnabled()) { - log.warn(msg, e); + log.warn(msg, eee); } - showMsgBox(e); + ErrorHelper.showErrorDialog(_("isisfish.error.no.select.simulation"), eee); return null; } @@ -216,7 +200,7 @@ } // ask new region name - String regionName = showInputDialog( + String regionName = JOptionPane.showInputDialog( _("isisfish.message.import.region.name"), "region from " + simulationName); if (regionName == null || "".equals(regionName)) { @@ -233,11 +217,11 @@ try { SimulationStorage.getSimulation(simulationName).extractRegion( regionName); - } catch (StorageException e) { + } catch (StorageException eee) { if (log.isErrorEnabled()) { - log.error("Can't extract region", e); + log.error("Can't extract region", eee); } - showMsgBox(e); + ErrorHelper.showErrorDialog(_("isisfish.error.region.import"), eee); } return regionName; } @@ -266,20 +250,20 @@ if (log.isErrorEnabled()) { log.error("Can't export region", eee); } - showMsgBox(eee); + ErrorHelper.showErrorDialog(_("isisfish.error.region.export"), eee); } return file; } /** - * Copy la region avec un autre nom + * Copy la region avec un autre nom. * - * @return TODO + * @return le nom de la nouvelle region */ public String copyRegion(RegionStorage regionStorage) { String newName = null; try { - newName = showInputDialog(_("isisfish.message.new.region.name")); + newName = JOptionPane.showInputDialog(_("isisfish.message.new.region.name")); File zip = regionStorage.createZip(); RegionStorage.importAndRenameZip(zip, newName); @@ -288,16 +272,17 @@ if (log.isErrorEnabled()) { log.error("Can't copy region", eee); } - showMsgBox(eee); + ErrorHelper.showErrorDialog(_("isisfish.error.region.copy"), eee); } return newName; } /** - * Remove region + * Remove region. * + * @param regionStorage region storage * @param cvsDelete if true delete region in CVS too - * @return TODO + * @return status message */ public String removeRegion(RegionStorage regionStorage, boolean cvsDelete) { String result = null; @@ -316,15 +301,16 @@ if (log.isErrorEnabled()) { log.error("Can't remove region", eee); } - showMsgBox(eee); + ErrorHelper.showErrorDialog(_("isisfish.error.region.remove"), eee); } return result; } /** - * Remove region + * Commit region. * - * @return TODO + * @param regionStorage region storage + * @return status message */ public String commitRegionInCVS(RegionStorage regionStorage) { String result = null; @@ -347,13 +333,13 @@ if (log.isErrorEnabled()) { log.error("Can't export region", eee); } - showMsgBox(eee); + ErrorHelper.showErrorDialog(_("isisfish.error.region.commit"), eee); } return result; } /** - * load region. + * Load region. * <p/> * RegionStorage, TopiaContext, FisheryRegion are put in uiContext data. * <p/> @@ -363,34 +349,33 @@ * @param name name of region * @return loaded region */ - public FisheryRegion loadRegion(jaxx.runtime.JAXXObject ui, String name) { + public FisheryRegion loadRegion(InputUI ui, String name) { if (log.isDebugEnabled()) { log.debug("loadRegion : " + name); } + + FisheryRegion region = null; try { RegionStorage regionStorage = null; - FisheryRegion fisheryRegion = null; TopiaContext isisContext = null; if (name != null && !" ".equals(name)) { regionStorage = RegionStorage.getRegion(name); isisContext = regionStorage.getStorage().beginTransaction(); - fisheryRegion = RegionStorage.getFisheryRegion(isisContext); + region = RegionStorage.getFisheryRegion(isisContext); ui.setContextValue(regionStorage); ui.setContextValue(isisContext); - return fisheryRegion; // FIXME session shoul be closed // but make lazy init later //isisContext.rollbackTransaction(); //isisContext.closeContext(); } - return null; } catch (Exception eee) { if (log.isErrorEnabled()) { log.error("Can't load region", eee); } - showMsgBox(eee); + ErrorHelper.showErrorDialog(_("isisfish.error.region.load"), eee); } - return null; + return region; } /** @@ -415,18 +400,18 @@ if (log.isErrorEnabled()) { log.error("Can't create region", eee); } - showMsgBox(eee); + ErrorHelper.showErrorDialog(_("isisfish.error.region.create"), eee); } } - /** + /* * Permet de creer simplement un nouvelle objet portant un nom par defaut. * Le nouvel element est automatiquement selectionné dans l'arbre * * @param type le type de l'entite a creer, le type est compose seulement du * nom de l'entite et pas du package. * @return null ou un fenetre d'erreur - */ + * public TopiaEntity create(TopiaContext isisContext, String type) { if (log.isTraceEnabled()) { log.trace("create called for " + type); @@ -451,16 +436,17 @@ if (log.isErrorEnabled()) { log.error("Can't create entity", eee); } - showMsgBox(eee); + ErrorHelper.showErrorDialog(_("isisfish.error.region.new"), eee); } return null; - } + }*/ - /** + /* * Save entity passed in argument, and commit * + * @param selected entity to save * @return the saved entity - */ + * public TopiaEntity save(TopiaEntity selected) { if (log.isTraceEnabled()) { log.trace("save called"); @@ -481,17 +467,17 @@ if (log.isErrorEnabled()) { log.error("Can't save region", eee); } - showMsgBox(eee); + ErrorHelper.showErrorDialog(_("isisfish.error.input.save"), eee); } return selected; - } + }*/ - /** + /* * Cancel all modification on entity (rollback), and force reload it and * refresh all ui component that name match 'type'Tab * * @return the roolbacked entity - */ + * public TopiaEntity cancel(TopiaEntity selected) { if (log.isTraceEnabled()) { log.trace("cancel called"); @@ -510,12 +496,12 @@ if (log.isErrorEnabled()) { log.error("Can't cancel modification in region", eee); } - showMsgBox(eee); + ErrorHelper.showErrorDialog(_("isisfish.error.region.cancel"), eee); } return selected; - } + }*/ - /** + /* * Delete one entity and commit the change, try to selected intelligently * other node in tree. * <p/> @@ -523,7 +509,7 @@ * package >.*" * * @return if ok return null else OutView error - */ + * public String remove(TopiaEntity selected) { if (log.isTraceEnabled()) { log.trace("remove called"); @@ -566,21 +552,21 @@ showMsgBox(eee); } return msg; - } + }*/ - /** + /* * Save an Equation as model, to reuse it for other equation * * @param eq equation to put in models * @return if ok return null else OutputView error message - */ + * public Object saveEquationAsModel(Equation eq) { try { if (eq != null) { String name = showInputDialog(""); - /*if ("".equals(name)) { - showMsgBox("Error " +_("isisfish.error.invalid.equation.name")); - }*/ + //if ("".equals(name)) { + // showMsgBox("Error " +_("isisfish.error.invalid.equation.name")); + //} if (name != null) { FormuleStorage storage = FormuleStorage.createFormule(eq .getCategory(), name, eq.getLanguage()); @@ -594,7 +580,7 @@ showMsgBox(eee); } return null; - } + }*/ /** * Save an Equation as model, to reuse it for other equation @@ -606,7 +592,7 @@ */ public Object saveAsModel(String category, String language, String content) { try { - String name = showInputDialog(_("isisfish.message.saveModel.dialog")); + String name = JOptionPane.showInputDialog(_("isisfish.message.saveModel.dialog")); /*if ("".equals(name)) { showMsgBox("Error " +_("isisfish.error.invalid.equation.name")); }*/ @@ -620,7 +606,7 @@ if (log.isErrorEnabled()) { log.error("Can't save equation as model", eee); } - showMsgBox(eee); + ErrorHelper.showErrorDialog(_("isisfish.error.equation.savemodel"), eee); } return null; } @@ -642,7 +628,7 @@ if (log.isErrorEnabled()) { log.error("Can't open editor", eee); } - showMsgBox(eee); + ErrorHelper.showErrorDialog(_("isisfish.error.equation.openeditor"), eee); } return null; } @@ -672,7 +658,7 @@ if (log.isErrorEnabled()) { log.error("Can't add selectivity", eee); } - showMsgBox(eee); + ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", "Selectivity"), eee); } return null; } @@ -686,15 +672,17 @@ gear.removePopulationSelectivity(selectivity); } } catch (Exception eee) { - log.error("Can't remove TargetSpecies", eee); - showMsgBox(eee); + if (log.isErrorEnabled()) { + log.error("Can't remove TargetSpecies", eee); + } + ErrorHelper.showErrorDialog(_("isisfish.error.input.removeentity", "Selectivity"), eee); } return null; } // InputMetier - public Object createSeasonInfo(Metier metier) { + /*public Object createSeasonInfo(Metier metier) { if (log.isTraceEnabled()) { log.trace("createSeasonInfo called"); } @@ -713,10 +701,10 @@ if (log.isErrorEnabled()) { log.error("Can't create MetierSeasonInfo", eee); } - showMsgBox(eee); + ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", "SeasonInfo"), eee); } return null; - } + }*/ /*public Object removeSeasonInfo(Metier metier, MetierSeasonInfo info) { if (log.isTraceEnabled()) { @@ -730,7 +718,7 @@ if (log.isErrorEnabled()) { log.error("Can't create MetierSeasonInfo", eee); } - showMsgBox(eee); + ErrorHelper.showErrorDialog(_("isisfish.error.input.removeentity", "SeasonInfo"), eee); } return null; }*/ @@ -762,7 +750,7 @@ if (log.isErrorEnabled()) { log.error("Can't add TargetSpecies", eee); } - showMsgBox(eee); + ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", "TargetSpecies"), eee); } return null; } @@ -780,7 +768,7 @@ if (log.isErrorEnabled()) { log.error("Can't remove TargetSpecies", eee); } - showMsgBox(eee); + ErrorHelper.showErrorDialog(_("isisfish.error.input.removeentity", "TargetSpecies"), eee); } return null; } @@ -808,7 +796,7 @@ if (log.isErrorEnabled()) { log.error("Can't create EffortDescription", eee); } - showMsgBox(eee); + ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", "EffortDescription"), eee); } } @@ -824,7 +812,7 @@ if (log.isErrorEnabled()) { log.error("Can't remove entity: " + effort, eee); } - showMsgBox(eee); + ErrorHelper.showErrorDialog(_("isisfish.error.input.removeentity", "EffortDescription"), eee); } return null; } @@ -864,7 +852,7 @@ if (log.isErrorEnabled()) { log.error("Can't create Population", eee); } - showMsgBox(eee); + ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", "Population"), eee); } return null; } @@ -898,7 +886,7 @@ if (log.isErrorEnabled()) { log.error("Can't create PopulationSeasonInfo", eee); } - showMsgBox(eee); + ErrorHelper.showErrorDialog(_("isisfish.error.input.removeentity", "PopulationSeasonInfo"), eee); } return seasonInfo; } @@ -916,7 +904,7 @@ if (log.isErrorEnabled()) { log.error("Can't remove PopulationSeasonInfo", eee); } - showMsgBox(eee); + ErrorHelper.showErrorDialog(_("isisfish.error.input.removeentity", "PopulationSeasonInfo"), eee); } } @@ -935,8 +923,10 @@ metier.update(); // isisContext.commitTransaction(); } catch (Exception eee) { - log.error("Can't create MetierSeasonInfo", eee); - showMsgBox(eee); + if (log.isErrorEnabled()) { + log.error("Can't create MetierSeasonInfo", eee); + } + ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", "MetierSeasonInfo"), eee); } } @@ -950,8 +940,10 @@ metier.getTopiaContext().commitTransaction(); } catch (Exception eee) { - log.error("Can't create MetierSeasonInfo", eee); - showMsgBox(eee); + if (log.isErrorEnabled()) { + log.error("Can't remove MetierSeasonInfo", eee); + } + ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", "MetierSeasonInfo"), eee); } } @@ -990,9 +982,9 @@ } } catch (Exception eee) { if (log.isErrorEnabled()) { - log.error("Can't remove PopulationSeasonInfo", eee); + log.error("Can't remove RecruitmentDistribution", eee); } - showMsgBox(eee); + ErrorHelper.showErrorDialog(_("isisfish.error.input.removeentity", "RecruitmentDistribution"), eee); } return null; } @@ -1013,7 +1005,7 @@ if (log.isErrorEnabled()) { log.error("Can't add migration", eee); } - showMsgBox(eee); + ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", "Migration"), eee); } return null; } @@ -1032,7 +1024,7 @@ if (log.isErrorEnabled()) { log.error("Can't add emigration", eee); } - showMsgBox(eee); + ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", "Emigration"), eee); } return null; } @@ -1051,14 +1043,19 @@ if (log.isErrorEnabled()) { log.error("Can't add immigration", eee); } - showMsgBox(eee); + ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", "Immigration"), eee); } return null; } // FisheryRegion - /** @return TODO */ - public Object addMap(FisheryRegion fisheryRegion) { + + /** + * Add new map in region. + * + * @param fisheryRegion fishery region + */ + public void addMap(FisheryRegion fisheryRegion) { if (log.isTraceEnabled()) { log.trace("AddMap called"); } @@ -1100,16 +1097,17 @@ if (log.isErrorEnabled()) { log.error("Can't copy .shp or .ssx file for: " + shp, eee); } - showMsgBox(eee); + ErrorHelper.showErrorDialog(_("isisfish.error.region.addmap"), eee); } - return null; } /** - * @param selectedMaps la list dans lequel il faut retirer la carte - * @return TODO + * Remove map in a region. + * + * @param fisheryRegion fishery region + * @param selectedMaps la liste de map a retirer */ - public Object removeMap(FisheryRegion fisheryRegion, Object[] selectedMaps) { + public void removeMap(FisheryRegion fisheryRegion, Object[] selectedMaps) { if (log.isTraceEnabled()) { log.trace("removeMap called"); } @@ -1136,9 +1134,8 @@ if (log.isErrorEnabled()) { log.error("Can't remove map", eee); } - showMsgBox(eee); + ErrorHelper.showErrorDialog(_("isisfish.error.region.removemap"), eee); } - return null; } /** @@ -1149,8 +1146,8 @@ * @param cellFile file of cells */ public void loadCellFile(String cellFile) { - if (log.isTraceEnabled()) { - log.trace("loadCell called"); + if (log.isWarnEnabled()) { + log.warn("loadCell called but not implemented"); } // FIXME todo loadCellFile } @@ -1207,7 +1204,7 @@ cell.setLand(false); cell.update(); } - // frame.setProgressValue(++progresscpt); + // frame.setProgressValue(++progresscpt); } } @@ -1229,13 +1226,13 @@ isisContext.commitTransaction(); } catch (Exception eee) { if (log.isErrorEnabled()) { - log.error(_("isisfish.error.save.region"), eee); + log.error(_("isisfish.error.region.save"), eee); } - showMsgBox(eee); + ErrorHelper.showErrorDialog(_("isisfish.error.region.save"), eee); } } - public Object checkFisheryRegion(FisheryRegion fisheryRegion) { + public void checkFisheryRegion(FisheryRegion fisheryRegion) { try { if (log.isTraceEnabled()) { log.trace("check called: "); @@ -1248,10 +1245,9 @@ dialog.setVisible(true); } catch (Exception eee) { if (log.isErrorEnabled()) { - log.error(_("isisfish.error.check.region"), eee); + log.error(_("isisfish.error.region.check"), eee); } - showMsgBox(eee); + ErrorHelper.showErrorDialog(_("isisfish.error.region.check"), eee); } - return null; } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-10-13 15:00:50 UTC (rev 2658) @@ -57,7 +57,7 @@ <script><![CDATA[ import fr.ifremer.isisfish.ui.WelcomePanelUI; import fr.ifremer.isisfish.entities.FisheryRegion; -import org.codelutin.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaEntity; import javax.swing.JComponent; import fr.ifremer.isisfish.ui.util.UtilsUI; import fr.ifremer.isisfish.ui.sensitivity.FactorWizardUI; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,7 +19,7 @@ package fr.ifremer.isisfish.ui.input; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.awt.Component; @@ -40,7 +40,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaEntity; import fr.ifremer.isisfish.entities.Cell; import fr.ifremer.isisfish.entities.FisheryRegion; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2009-10-13 15:00:50 UTC (rev 2658) @@ -24,7 +24,7 @@  <fr.ifremer.isisfish.entities.Formule id='formule' javaBean='null'/> <String id='lblText' javaBean='null'/> - <org.codelutin.topia.persistence.TopiaEntity id='bean' javaBean='null'/> + <org.nuiton.topia.persistence.TopiaEntity id='bean' javaBean='null'/> <Class id='clazz' javaBean='null'/> <String id='methodGet' javaBean='null'/> <String id='methodSet' javaBean='null'/> @@ -35,7 +35,7 @@ import fr.ifremer.isisfish.entities.Formule; import fr.ifremer.isisfish.entities.Equation; import java.lang.reflect.Method; -import org.codelutin.topia.TopiaContext; +import org.nuiton.topia.TopiaContext; import jaxx.runtime.swing.Item; protected DocumentListener listener = null; @@ -47,7 +47,7 @@ //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); formuleComboBox.setModel(new DefaultComboBoxModel()); try { - editor.open(org.codelutin.util.FileUtil.getTempFile("", ".java")); + editor.open(org.nuiton.util.FileUtil.getTempFile("", ".java")); } catch (IOException e) { if (log.isErrorEnabled()) { log.error("Error on property change", e); @@ -118,7 +118,7 @@ public void refresh(){ editor.getCurrentEditor().removeDocumentListener(listener); try { - editor.open(org.codelutin.util.FileUtil.getTempFile("", ".java")); + editor.open(org.nuiton.util.FileUtil.getTempFile("", ".java")); } catch (IOException ex) { if (log.isErrorEnabled()) { log.error("Can't refresh editor", ex); @@ -184,7 +184,7 @@ } else { try { - editor.open(org.codelutin.util.FileUtil.getTempFile("", ".java")); + editor.open(org.nuiton.util.FileUtil.getTempFile("", ".java")); } catch (IOException e) { if (log.isErrorEnabled()) { log.error("Open editor", e); @@ -230,7 +230,7 @@ </Table> </cell> <cell fill='both' weightx='1.0' weighty='1.0'> - <org.codelutin.widget.editor.Editor id='editor' askIfNotSaved="false" enabled='{isActif()}'/> + <org.nuiton.widget.editor.Editor id='editor' askIfNotSaved="false" enabled='{isActif()}'/> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,7 +19,7 @@ package fr.ifremer.isisfish.ui.input; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.awt.Component; import java.awt.Dimension; @@ -42,21 +42,21 @@ import javax.swing.JScrollPane; import javax.swing.JTextArea; -import jaxx.runtime.swing.ErrorDialogUI; import jaxx.runtime.swing.navigation.NavigationTreeModel.NavigationTreeNode; import org.apache.commons.beanutils.MethodUtils; import org.apache.commons.lang.ClassUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.TopiaException; -import org.codelutin.topia.persistence.TopiaDAO; -import org.codelutin.topia.persistence.TopiaEntity; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.topia.persistence.TopiaEntity; import fr.ifremer.isisfish.IsisFishDAOHelper; import fr.ifremer.isisfish.ui.SaveVerifier; import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabUI; +import fr.ifremer.isisfish.ui.util.ErrorHelper; /** * InputSaveVerifier. @@ -240,7 +240,7 @@ log.error("Can't remove entity: " + currentEntities.get(0), eee); } - ErrorDialogUI.showError(eee); + ErrorHelper.showErrorDialog(_("isisfish.error.input.removeentity"), eee); } rootUI.setStatusMessage(msg); // set noModif BEFORE path changed @@ -308,7 +308,7 @@ if (log.isErrorEnabled()) { log.error("Can't create entity", eee); } - showMsgBox(eee); + ErrorHelper.showErrorDialog(_("isisfish.error.input.createentity"), eee); } } @@ -334,7 +334,7 @@ if (log.isErrorEnabled()) { log.error("Can't save region", eee); } - showMsgBox(eee); + ErrorHelper.showErrorDialog(_("isisfish.error.input.saveentity"), eee); } } @@ -373,19 +373,10 @@ if (log.isErrorEnabled()) { log.error("Can't cancel modification in region", eee); } - showMsgBox(eee); + ErrorHelper.showErrorDialog(_("isisfish.error.input.cancelentity"), eee); } } - /** - * Display exception into jaxx error dialog component. - * - * @param e exception to display - */ - protected void showMsgBox(Exception e) { - ErrorDialogUI.showError(e); - } - protected void setPanelsActifs() { for (InputContentUI panel : currentPanels) { panel.setActif(editable); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2009-10-13 15:00:50 UTC (rev 2658) @@ -43,7 +43,7 @@ import jaxx.runtime.swing.navigation.NavigationTreeModel.NavigationTreeNode; import jaxx.runtime.swing.navigation.NavigationUtil; import jaxx.runtime.swing.navigation.NavigationTreeModel; -import org.codelutin.topia.TopiaContext; +import org.nuiton.topia.TopiaContext; getContextValue(WelcomeSaveVerifier.class).addSaveVerifier(getVerifier()); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2009-10-13 15:00:50 UTC (rev 2658) @@ -32,7 +32,7 @@ import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.PopulationImpl; import javax.swing.table.DefaultTableModel; -import org.codelutin.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaEntity; addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-10-13 15:00:50 UTC (rev 2658) @@ -26,8 +26,8 @@ import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.PopulationImpl; -import org.codelutin.math.matrix.gui.MatrixPanelEvent; -import org.codelutin.math.matrix.gui.MatrixPanelListener; +import org.nuiton.math.matrix.gui.MatrixPanelEvent; +import org.nuiton.math.matrix.gui.MatrixPanelListener; MatrixPanelListener listener = new MatrixPanelListener() { @Override @@ -88,7 +88,7 @@ </row> <row> <cell columns='2' fill='both' weightx='1.0' weighty='0.5'> - <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationCapturability' + <org.nuiton.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationCapturability' matrix='{getBean().getCapturability() == null ? null : getBean().getCapturability().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"Capturability"'/> </cell> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-10-13 15:00:50 UTC (rev 2658) @@ -41,9 +41,9 @@ import fr.ifremer.isisfish.entities.PopulationGroupImpl; import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.PopulationImpl; -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.math.matrix.gui.MatrixPanelEvent; -import org.codelutin.math.matrix.gui.MatrixPanelListener; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.math.matrix.gui.MatrixPanelEvent; +import org.nuiton.math.matrix.gui.MatrixPanelListener; addPropertyChangeListener("populationGroup", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { @@ -177,7 +177,7 @@ <JLabel text="isisfish.populationGroup.naturalDeathRate" enabled='{isPopGroupNotNull()}'/> </cell> <cell columns='2' fill='both' weightx='1.0' weighty='0.5'> - <org.codelutin.math.matrix.gui.JAXXMatrixEditor id='fieldPopulationGroupNaturalDeathRate' + <org.nuiton.math.matrix.gui.JAXXMatrixEditor id='fieldPopulationGroupNaturalDeathRate' enabled='false' decorator='boxed' _bean='{PopulationImpl.class}' _method='"NaturalDeathRateMatrix"' />  Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2009-10-13 15:00:50 UTC (rev 2658) @@ -32,9 +32,9 @@ import fr.ifremer.isisfish.entities.PopulationImpl; import fr.ifremer.isisfish.entities.PopulationSeasonInfo; import fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl; -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.math.matrix.gui.MatrixPanelEvent; -import org.codelutin.math.matrix.gui.MatrixPanelListener; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.math.matrix.gui.MatrixPanelEvent; +import org.nuiton.math.matrix.gui.MatrixPanelListener; import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.PopulationGroup; import fr.ifremer.isisfish.entities.PopulationSeasonInfo; @@ -186,7 +186,7 @@ </row> <row columns='4'> <cell fill='both' weightx='1.0' weighty='1.0'> - <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='populationMigrationEmigrationTable' linearModel="true" enabled='{isActif()}'/> + <org.nuiton.math.matrix.gui.JAXXMatrixEditor id ='populationMigrationEmigrationTable' linearModel="true" enabled='{isActif()}'/> </cell> </row> <row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2009-10-13 15:00:50 UTC (rev 2658) @@ -37,9 +37,9 @@ import fr.ifremer.isisfish.entities.Zone; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.math.matrix.gui.MatrixPanelEvent; -import org.codelutin.math.matrix.gui.MatrixPanelListener; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.math.matrix.gui.MatrixPanelEvent; +import org.nuiton.math.matrix.gui.MatrixPanelListener; addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { @@ -177,7 +177,7 @@ </row> <row columns='4'> <cell fill='both' weightx='1.0' weighty='1.0'> - <org.codelutin.math.matrix.gui.JAXXMatrixEditor id='populationMigrationImmigrationTable' linearModel="true" enabled='{isActif()}'/> + <org.nuiton.math.matrix.gui.JAXXMatrixEditor id='populationMigrationImmigrationTable' linearModel="true" enabled='{isActif()}'/> </cell> </row> <row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2009-10-13 15:00:50 UTC (rev 2658) @@ -37,9 +37,9 @@ import fr.ifremer.isisfish.entities.PopulationGroup; import fr.ifremer.isisfish.entities.PopulationSeasonInfo; import fr.ifremer.isisfish.entities.Zone; -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.math.matrix.gui.MatrixPanelEvent; -import org.codelutin.math.matrix.gui.MatrixPanelListener; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.math.matrix.gui.MatrixPanelEvent; +import org.nuiton.math.matrix.gui.MatrixPanelListener; addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { @@ -196,7 +196,7 @@ </row> <row columns='4'> <cell fill='both' weightx='1.0' weighty='1.0'> - <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='populationMigrationMigrationTable' linearModel='{true}' enabled='{isActif()}'/> + <org.nuiton.math.matrix.gui.JAXXMatrixEditor id ='populationMigrationMigrationTable' linearModel='{true}' enabled='{isActif()}'/> </cell> </row> <row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-10-13 15:00:50 UTC (rev 2658) @@ -28,8 +28,8 @@ import fr.ifremer.isisfish.entities.Formule; import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.PopulationImpl; -import org.codelutin.math.matrix.gui.MatrixPanelEvent; -import org.codelutin.math.matrix.gui.MatrixPanelListener; +import org.nuiton.math.matrix.gui.MatrixPanelEvent; +import org.nuiton.math.matrix.gui.MatrixPanelListener; import jaxx.runtime.swing.editor.NumberEditor; addPropertyChangeListener("bean", new PropertyChangeListener() { @@ -119,7 +119,7 @@ <JLabel text="isisfish.populationRecruitment.recruitmentDistribution" enabled='{isActif()}'/> </cell> <cell fill='both' weightx='1.0' weighty='0.5'> - <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationRecruitmentDistribution' + <org.nuiton.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationRecruitmentDistribution' matrix='{getBean().getRecruitmentDistribution() == null ? null : getBean().getRecruitmentDistribution().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"RecruitmentDistribution"'/> </cell> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2009-10-13 15:00:50 UTC (rev 2658) @@ -29,13 +29,14 @@ <script><![CDATA[ import fr.ifremer.isisfish.entities.PopulationSeasonInfo; -import org.codelutin.math.matrix.gui.JAXXMatrixEditor; import fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl; -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.math.matrix.gui.MatrixPanelEvent; -import org.codelutin.math.matrix.gui.MatrixPanelListener; -import jaxx.runtime.swing.ErrorDialogUI; +import fr.ifremer.isisfish.ui.util.ErrorHelper; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.math.matrix.gui.JAXXMatrixEditor; +import org.nuiton.math.matrix.gui.MatrixPanelEvent; +import org.nuiton.math.matrix.gui.MatrixPanelListener; + protected MatrixPanelListener matrixPanelListener; matrixPanelListener = new MatrixPanelListener() { @@ -93,7 +94,7 @@ if (log.isErrorEnabled()) { log.error("Can't (un)spacialize Matrix Change Of Group", eee); } - ErrorDialogUI.showError(eee); + ErrorHelper.showErrorDialog(_("isisfish.error.input.spacializematrix"), eee); } } @@ -160,7 +161,7 @@ <Panel/> </cell> <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> - <org.codelutin.math.matrix.gui.JAXXMatrixEditor id='matrixPanelPopulationSeasonLengthChange' + <org.nuiton.math.matrix.gui.JAXXMatrixEditor id='matrixPanelPopulationSeasonLengthChange' enabled='{isPopSeasonInfoNotNull()}' _bean='{PopulationSeasonInfoImpl.class}' _method='"LengthChangeMatrix"' visible='{isAgeGroupType()}' decorator='boxed' Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-10-13 15:00:50 UTC (rev 2658) @@ -35,9 +35,9 @@ import fr.ifremer.isisfish.entities.PopulationImpl; import fr.ifremer.isisfish.ui.widget.Interval; import fr.ifremer.isisfish.ui.widget.IntervalPanel; -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.math.matrix.gui.MatrixPanelEvent; -import org.codelutin.math.matrix.gui.MatrixPanelListener; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.math.matrix.gui.MatrixPanelEvent; +import org.nuiton.math.matrix.gui.MatrixPanelListener; protected MatrixPanelListener matrixPanelListener; protected Interval seasonInterval; @@ -297,7 +297,7 @@ visible='{getPopulationSeasonInfo().getReproduction()}'/> </cell> <cell fill='both' weightx='1.0' weighty='0.2'> - <org.codelutin.math.matrix.gui.JAXXMatrixEditor id='fieldPopulationSeasonReproductionDistribution' + <org.nuiton.math.matrix.gui.JAXXMatrixEditor id='fieldPopulationSeasonReproductionDistribution' matrix='{getPopulationSeasonInfo() == null ? null : getPopulationSeasonInfo().getReproductionDistribution().copy()}' enabled='{isPopSeasonInfoNotNull()}' visible='{getPopulationSeasonInfo().getReproduction()}' Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx 2009-10-13 15:00:50 UTC (rev 2658) @@ -29,10 +29,10 @@ import fr.ifremer.isisfish.ui.widget.editor.GenericCell; import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.PopulationImpl; -import org.codelutin.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaEntity; import fr.ifremer.isisfish.ui.WelcomePanelUI; -import org.codelutin.math.matrix.gui.MatrixPanelEvent; -import org.codelutin.math.matrix.gui.MatrixPanelListener; +import org.nuiton.math.matrix.gui.MatrixPanelEvent; +import org.nuiton.math.matrix.gui.MatrixPanelListener; MatrixPanelListener listener = new MatrixPanelListener() { @Override @@ -176,7 +176,7 @@ </row> <row> <cell columns='3' fill='both' weightx='1.0' weighty='0.5'> - <org.codelutin.math.matrix.gui.JAXXMatrixEditor id='fieldPopulationMappingZoneReproZoneRecru' constructorParams='false' enabled='{isActif()}'/> + <org.nuiton.math.matrix.gui.JAXXMatrixEditor id='fieldPopulationMappingZoneReproZoneRecru' constructorParams='false' enabled='{isActif()}'/> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx 2009-10-13 15:00:50 UTC (rev 2658) @@ -25,7 +25,7 @@ <script><![CDATA[ -import org.codelutin.topia.TopiaException; +import org.nuiton.topia.TopiaException; import fr.ifremer.isisfish.entities.Port; import fr.ifremer.isisfish.entities.Equation; import fr.ifremer.isisfish.entities.VesselType; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-10-13 15:00:50 UTC (rev 2658) @@ -29,8 +29,8 @@ import fr.ifremer.isisfish.entities.StrategyMonthInfoImpl; import fr.ifremer.isisfish.entities.Strategy; import fr.ifremer.isisfish.entities.StrategyImpl; -import org.codelutin.math.matrix.gui.MatrixPanelEvent; -import org.codelutin.math.matrix.gui.MatrixPanelListener; +import org.nuiton.math.matrix.gui.MatrixPanelEvent; +import org.nuiton.math.matrix.gui.MatrixPanelListener; import jaxx.runtime.swing.editor.NumberEditor; import fr.ifremer.isisfish.entities.TripType; @@ -147,7 +147,7 @@ </row> <row> <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> - <org.codelutin.math.matrix.gui.JAXXMatrixEditor id="fieldStrategyMonthInfoProportion" linearModelShowDefault='{true}' + <org.nuiton.math.matrix.gui.JAXXMatrixEditor id="fieldStrategyMonthInfoProportion" linearModelShowDefault='{true}' linearModel='{true}' matrix='{getStrategyMonthInfo().getProportionMetier() == null ? null : getStrategyMonthInfo().getProportionMetier().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{fr.ifremer.isisfish.entities.StrategyMonthInfoImpl.class}' _method='"ProportionMetier"'/> </cell> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2009-10-13 15:00:50 UTC (rev 2658) @@ -29,7 +29,7 @@ import fr.ifremer.isisfish.entities.Strategy; import fr.ifremer.isisfish.entities.Formule; import fr.ifremer.isisfish.entities.SetOfVessels; -import org.codelutin.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaEntity; import fr.ifremer.isisfish.ui.WelcomePanelUI; import fr.ifremer.isisfish.ui.widget.editor.GenericCell; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2009-10-13 15:00:50 UTC (rev 2658) @@ -85,7 +85,7 @@ <JLabel text="isisfish.tripType.duration" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldTripTypeDuration" text='{getBean().getTripDuration().getHour()}' toolTipText="in hour" + <JTextField id="fieldTripTypeDuration" text='{getBean().getTripDuration().getHour()}' toolTipText="isisfish.common.duration.inhours" onKeyReleased='getBean().setTripDuration(new TimeUnit(Double.parseDouble(fieldTripTypeDuration.getText()) * 3600))' enabled='{isActif()}' decorator='boxed' _bean='{TripTypeImpl.class}' _method='"TripDuration"'/> </cell> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2009-10-13 15:00:50 UTC (rev 2658) @@ -146,7 +146,7 @@ <JLabel text="isisfish.vesselType.maxDuration" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldVesselTypeMaxTripDuration" text='{getBean().getMaxTripDuration().getHour()}' toolTipText="in hour" + <JTextField id="fieldVesselTypeMaxTripDuration" text='{getBean().getMaxTripDuration().getHour()}' toolTipText="isisfish.common.duration.inhours" enabled='{isActif()}' onKeyReleased='getBean().setMaxTripDuration(new TimeUnit(Double.parseDouble(fieldVesselTypeMaxTripDuration.getText()) * 3600))' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"MaxTripDuration"'/> </cell> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx 2009-10-13 15:00:50 UTC (rev 2658) @@ -21,7 +21,7 @@ <script> <![CDATA[ - import org.codelutin.topia.TopiaContext; + import org.nuiton.topia.TopiaContext; import fr.ifremer.isisfish.IsisFishDAOHelper; import fr.ifremer.isisfish.entities.Equation; import fr.ifremer.isisfish.entities.Population; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -18,7 +18,7 @@ package fr.ifremer.isisfish.ui.input.check; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.util.Collection; import java.util.Collections; @@ -26,8 +26,8 @@ import java.util.List; import java.util.Set; -import org.codelutin.math.matrix.MatrixIterator; -import org.codelutin.math.matrix.MatrixND; +import org.nuiton.math.matrix.MatrixIterator; +import org.nuiton.math.matrix.MatrixND; import fr.ifremer.isisfish.entities.Cell; import fr.ifremer.isisfish.entities.EffortDescription; @@ -112,7 +112,7 @@ result.addWarning(classPop, _("isisfish.error.not.null.mean.weight")); } // if(classPop.getMortaliteNaturelle() == 0){ - // result.addWarning(classPop, _("isisfish.error.not.null.natiral.death")); + // result.addWarning(classPop, _("isisfish.error.not.null.natural.death")); // } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultFrame.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultFrame.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultFrame.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -18,7 +18,7 @@ package fr.ifremer.isisfish.ui.input.check; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import javax.swing.JFrame; import javax.swing.WindowConstants; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableModel.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableModel.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -32,8 +32,8 @@ import javax.swing.table.JTableHeader; import javax.swing.table.TableColumnModel; -import org.codelutin.topia.persistence.TopiaEntity; -import org.codelutin.topia.persistence.TopiaId; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaId; /** * CheckResultTableModel. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearPopulationSelectivityModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearPopulationSelectivityModel.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearPopulationSelectivityModel.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -18,7 +18,7 @@ package fr.ifremer.isisfish.ui.input.gear; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.awt.Component; import java.util.List; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoTargetSpeciesModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoTargetSpeciesModel.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoTargetSpeciesModel.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -18,7 +18,7 @@ package fr.ifremer.isisfish.ui.input.metier; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.awt.Component; import java.util.List; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/logging/console/LogConsoleUI.jaxx =================================================================== (Binary files differ) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/analyzeplan/AnalyzePlanComboRenderer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/analyzeplan/AnalyzePlanComboRenderer.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/analyzeplan/AnalyzePlanComboRenderer.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -18,7 +18,7 @@ package fr.ifremer.isisfish.ui.models.analyzeplan; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.awt.Component; import java.util.HashMap; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/analyzeplan/AnalyzePlanParametersTableModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/analyzeplan/AnalyzePlanParametersTableModel.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/analyzeplan/AnalyzePlanParametersTableModel.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -18,7 +18,7 @@ package fr.ifremer.isisfish.ui.models.analyzeplan; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.util.ArrayList; import java.util.List; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportNameListRenderer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportNameListRenderer.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportNameListRenderer.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -18,7 +18,7 @@ package fr.ifremer.isisfish.ui.models.export; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.awt.Component; import java.util.HashMap; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportParametersTableModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportParametersTableModel.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportParametersTableModel.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -18,7 +18,7 @@ package fr.ifremer.isisfish.ui.models.export; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.util.ArrayList; import java.util.List; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/result/ResultListRenderer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/result/ResultListRenderer.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/result/ResultListRenderer.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -18,7 +18,7 @@ package fr.ifremer.isisfish.ui.models.result; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.awt.Component; import java.lang.reflect.Field; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleComboRenderer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleComboRenderer.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleComboRenderer.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -18,7 +18,7 @@ package fr.ifremer.isisfish.ui.models.rule; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.awt.Component; import java.util.HashMap; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersTableModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersTableModel.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersTableModel.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -18,7 +18,7 @@ package fr.ifremer.isisfish.ui.models.rule; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.util.ArrayList; import java.util.List; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivity/SensitivityCalculatorComboRenderer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivity/SensitivityCalculatorComboRenderer.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivity/SensitivityCalculatorComboRenderer.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -18,7 +18,7 @@ package fr.ifremer.isisfish.ui.models.sensitivity; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.awt.Component; import java.util.HashMap; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivity/SensitivityCalculatorParametersTableModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivity/SensitivityCalculatorParametersTableModel.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivity/SensitivityCalculatorParametersTableModel.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -18,7 +18,7 @@ package fr.ifremer.isisfish.ui.models.sensitivity; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.util.ArrayList; import java.util.List; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListRenderer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListRenderer.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListRenderer.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -18,7 +18,7 @@ package fr.ifremer.isisfish.ui.models.sensitivityexport; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.awt.Component; import java.util.HashMap; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportParametersTableModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportParametersTableModel.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportParametersTableModel.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -18,7 +18,7 @@ package fr.ifremer.isisfish.ui.models.sensitivityexport; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.util.ArrayList; import java.util.List; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/queue/QueueAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/queue/QueueAction.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/queue/QueueAction.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -18,16 +18,15 @@ package fr.ifremer.isisfish.ui.queue; -import static org.codelutin.i18n.I18n._; -import jaxx.runtime.swing.ErrorDialogUI; +import static org.nuiton.i18n.I18n._; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.log.UserLog; import fr.ifremer.isisfish.logging.SimulationLoggerUtil; import fr.ifremer.isisfish.simulator.launcher.SimulationJob; import fr.ifremer.isisfish.simulator.launcher.SimulationService; +import fr.ifremer.isisfish.ui.util.ErrorHelper; /** * Common action for all queue ui. @@ -122,8 +121,10 @@ try { SimulationLoggerUtil.showSimulationLogConsole(id); } catch (Exception eee) { - UserLog.error(_("Can't open log for %s", id), eee); - ErrorDialogUI.showError(eee); + if (log.isErrorEnabled()) { + log.error(_("Can't open log for %s", id), eee); + } + ErrorHelper.showErrorDialog(_("Can't open log for %s", id), eee); } } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/DataResult.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/DataResult.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/DataResult.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,8 +19,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.util.FileUtil; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.util.FileUtil; /** Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/DataResultUI.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/DataResultUI.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/DataResultUI.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -9,7 +9,7 @@ package fr.ifremer.isisfish.ui.result; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.awt.BorderLayout; import java.awt.Component; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanModel.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanModel.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -3,7 +3,7 @@ import java.util.HashSet; import java.util.Iterator; -import org.codelutin.math.matrix.MatrixND; +import org.nuiton.math.matrix.MatrixND; import com.jrefinery.chart.CategoryItemRenderer; import com.jrefinery.chart.CategoryPlot; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanUI.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanUI.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanUI.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -9,7 +9,7 @@ package fr.ifremer.isisfish.ui.result; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.awt.BorderLayout; import java.awt.Component; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphComboRenderer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphComboRenderer.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphComboRenderer.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -1,6 +1,6 @@ package fr.ifremer.isisfish.ui.result; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.awt.Component; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphMatrixNDDataset.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphMatrixNDDataset.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphMatrixNDDataset.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -5,7 +5,7 @@ import java.util.List; import java.util.ResourceBundle; -import org.codelutin.math.matrix.MatrixND; +import org.nuiton.math.matrix.MatrixND; import com.jrefinery.data.AbstractSeriesDataset; import com.jrefinery.data.CategoryDataset; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/InfoItem.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/InfoItem.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/InfoItem.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -14,13 +14,13 @@ package fr.ifremer.isisfish.ui.result; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import javax.swing.BorderFactory; import javax.swing.ImageIcon; import javax.swing.ListSelectionModel; -import org.codelutin.util.Resource; +import org.nuiton.util.Resource; public class InfoItem extends InfoItemUI implements InfoPanelable { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemDate.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemDate.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemDate.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -14,13 +14,13 @@ package fr.ifremer.isisfish.ui.result; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import javax.swing.BorderFactory; import javax.swing.ImageIcon; import javax.swing.ListSelectionModel; -import org.codelutin.util.Resource; +import org.nuiton.util.Resource; public class InfoItemDate extends InfoItemDateUI implements InfoPanelable { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemDateUI.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemDateUI.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemDateUI.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -9,7 +9,7 @@ package fr.ifremer.isisfish.ui.result; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.awt.BorderLayout; import java.awt.Component; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemUI.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemUI.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemUI.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -9,7 +9,7 @@ package fr.ifremer.isisfish.ui.result; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.awt.BorderLayout; import java.awt.Component; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/MatrixInfoTableModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/MatrixInfoTableModel.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/MatrixInfoTableModel.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -1,7 +1,7 @@ package fr.ifremer.isisfish.ui.result; -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.math.matrix.MatrixException; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.math.matrix.MatrixException; import fr.ifremer.isisfish.types.Date; import javax.swing.table.AbstractTableModel; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultEdit.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultEdit.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultEdit.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -13,7 +13,7 @@ package fr.ifremer.isisfish.ui.result; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.awt.Component; import java.awt.GridBagConstraints; @@ -40,10 +40,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.topia.TopiaContext; -import org.codelutin.util.FileUtil; -import org.codelutin.util.Resource; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.topia.TopiaContext; +import org.nuiton.util.FileUtil; +import org.nuiton.util.Resource; import fr.ifremer.isisfish.datastore.ExportStorage; import fr.ifremer.isisfish.datastore.ResultStorage; @@ -293,7 +293,7 @@ resume.append(_("isisfish.common.sum")).append(mat1.getName()).append(": ").append(mat1.getValue(0)).append("\n"); } } catch (Exception eee) { - resume.append(_("isisfish.error.no.matrix" + name)); + resume.append(_("isisfish.error.no.matrix", name)); } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultEditUI.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultEditUI.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultEditUI.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -9,7 +9,7 @@ package fr.ifremer.isisfish.ui.result; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.awt.BorderLayout; import java.awt.Component; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -10,7 +10,7 @@ * @version */ -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.logging.SimulationLoggerUtil; @@ -19,6 +19,7 @@ import fr.ifremer.isisfish.simulator.launcher.SimulationService; import fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener; import fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil; +import fr.ifremer.isisfish.ui.util.ErrorHelper; import fr.ifremer.isisfish.ui.widget.filter.FilterModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -30,7 +31,6 @@ import java.io.IOException; import java.text.ParseException; import java.util.List; -import jaxx.runtime.swing.ErrorDialogUI; public class ResultView extends ResultViewUI { @@ -68,8 +68,10 @@ try { initSimulation(); } catch (Exception e) { - log.warn(_("could not create simulation filter model for reason %1$s",e.getMessage()),e); - showMsgBox(e); + if (log.isWarnEnabled()) { + log.warn(_("could not create simulation filter model for reason %1$s", e.getMessage()),e); + } + ErrorHelper.showErrorDialog(_("could not create simulation filter model for reason %1$s", e.getMessage()), e); } } @@ -120,8 +122,10 @@ storage.delete(false); initSimulation(); } catch (Exception eee) { - log.warn("Can't delete simulation", eee); - showMsgBox(eee); + if (log.isWarnEnabled()) { + log.warn("Can't delete simulation", eee); + } + ErrorHelper.showErrorDialog(_("Can't delete simulation"), eee); } } } @@ -143,11 +147,13 @@ // intFrame.pack(); intFrame.setSize(new Dimension(800,700)); getDesktopPane().add(intFrame); - try{ + try { intFrame.setSelected(true); } catch (PropertyVetoException eee) { - log.warn("Error dans l internalFrame ", eee); - showMsgBox(eee); + if (log.isWarnEnabled()) { + log.warn("Error dans l internalFrame ", eee); + } + ErrorHelper.showErrorDialog(_("Can't open simulation internal frame"), eee); } } } @@ -159,8 +165,10 @@ SimulationLoggerUtil.showSimulationLogConsole(name); } catch (Exception e) { - log.error(e); - showMsgBox(e); + if (log.isErrorEnabled()) { + log.error(_("Can't display simulation log"), e); + } + ErrorHelper.showErrorDialog(_("Can't display simulation log"), e); } } public void on_filterSimulationLogButton_clicked() { @@ -173,12 +181,11 @@ model.addElement(s); } } catch (Exception e) { - log.warn(_("could not filter on simulations"), e); - showMsgBox(e); + if (log.isWarnEnabled()) { + log.warn(_("could not filter on simulations"), e); + } + ErrorHelper.showErrorDialog(_("could not filter on simulations"), e); } } - protected void showMsgBox(Exception eee){ - ErrorDialogUI.showError(eee); - } }// ResultView Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUI.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUI.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUI.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -9,7 +9,7 @@ package fr.ifremer.isisfish.ui.result; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import javax.swing.*; import java.awt.*; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResumePanelUI.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResumePanelUI.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResumePanelUI.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -9,7 +9,7 @@ package fr.ifremer.isisfish.ui.result; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.awt.BorderLayout; import java.awt.Component; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/SimpleResultatMapBean.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/SimpleResultatMapBean.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/SimpleResultatMapBean.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -1,6 +1,6 @@ package fr.ifremer.isisfish.ui.result; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import com.bbn.openmap.gui.OMToolSet; import com.bbn.openmap.gui.Tool; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/SimpleResultatMapBeanUI.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/SimpleResultatMapBeanUI.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/SimpleResultatMapBeanUI.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -9,7 +9,7 @@ package fr.ifremer.isisfish.ui.result; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.awt.BorderLayout; import java.awt.Component; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ExportDialogUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ExportDialogUI.jaxx 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ExportDialogUI.jaxx 2009-10-13 15:00:50 UTC (rev 2658) @@ -21,7 +21,7 @@ <JDialog modal="true" resizable='false' title='isisfish.script.export'> <script> -// public org.codelutin.vcs.ui.FieldModelUtil.ModuleFile model; +// public org.nuiton.vcs.ui.FieldModelUtil.ModuleFile model; public Object model = null; public boolean isOkEnabled() { return !isEmpty(); // && model.getSelected(0).size() > 0; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/FileSelectionTableModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/FileSelectionTableModel.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/FileSelectionTableModel.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -18,7 +18,7 @@ package fr.ifremer.isisfish.ui.script; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.util.ArrayList; import java.util.List; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,7 +19,7 @@ package fr.ifremer.isisfish.ui.script; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.awt.Desktop; import java.io.ByteArrayOutputStream; @@ -42,13 +42,11 @@ import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.TreePath; -import jaxx.runtime.swing.ErrorDialogUI; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.util.FileUtil; -import org.codelutin.util.ZipUtil; -import org.codelutin.widget.SwingUtil; +import org.nuiton.util.FileUtil; +import org.nuiton.util.ZipUtil; +import org.nuiton.widget.SwingUtil; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishRuntimeException; @@ -63,6 +61,7 @@ import fr.ifremer.isisfish.datastore.SensitivityStorage; import fr.ifremer.isisfish.datastore.SimulatorStorage; import fr.ifremer.isisfish.equation.Language; +import fr.ifremer.isisfish.ui.util.ErrorHelper; import fr.ifremer.isisfish.ui.widget.editor.GenericCell; import fr.ifremer.isisfish.util.ClasspathTemplateLoader; import fr.ifremer.isisfish.util.CompilationResult; @@ -127,10 +126,6 @@ } - protected void showMsgBox(Exception eee) { - ErrorDialogUI.showError(eee); - } - public CodeSourceStorage getCode() { return code; } @@ -355,9 +350,17 @@ } + /** + * Write error in log and display exception to user. + * + * @param s message + * @param eee cause + */ protected void returnError(String s, Exception eee) { - log.error(s, eee); - showMsgBox(eee); + if (log.isErrorEnabled()) { + log.error(s, eee); + } + ErrorHelper.showErrorDialog(s, eee); } public void loadScript(GenericCell c, String fileName, String type) { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2009-10-13 15:00:50 UTC (rev 2658) @@ -380,7 +380,7 @@ <javax.swing.JTree id="tree" name="tree" rootVisible="false" model='{getTreeModel()}' /> </JScrollPane> <JSplitPane oneTouchExpandable="true" resizeWeight="0.75" orientation="VERTICAL"> - <org.codelutin.widget.editor.Editor id='editor'/> + <org.nuiton.widget.editor.Editor id='editor'/> <JScrollPane> <JTextArea id="actionLogArea" editable="false" font='{new Font("Monospaced",Font.PLAIN, 12)}' /> </JScrollPane> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/action/BackupAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/action/BackupAction.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/action/BackupAction.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -26,7 +26,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.util.FileUtil; +import org.nuiton.util.FileUtil; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishRuntimeException; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/action/ChooseFileAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/action/ChooseFileAction.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/action/ChooseFileAction.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,7 +19,7 @@ package fr.ifremer.isisfish.ui.script.action; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import javax.swing.AbstractAction; import javax.swing.JDialog; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/action/ExportAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/action/ExportAction.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/action/ExportAction.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -18,7 +18,7 @@ package fr.ifremer.isisfish.ui.script.action; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.awt.event.ActionEvent; import java.io.File; @@ -32,7 +32,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.util.ZipUtil; +import org.nuiton.util.ZipUtil; import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.ui.script.FileSelectionTableModel; @@ -93,7 +93,7 @@ if (dst.exists()) { int resp = JOptionPane.showConfirmDialog(dialog, - _("isisfish.message.file.already.exists" + dst)); + _("isisfish.message.file.already.exists", dst)); if (resp == JOptionPane.CANCEL_OPTION) { dialog.dispose(); @@ -106,7 +106,7 @@ } } else if (!dst.getParentFile().exists()) { int resp = JOptionPane.showConfirmDialog(dialog, - _("isisfish.message.directory.not.exists" + dst)); + _("isisfish.message.directory.not.exists", dst)); if (resp == JOptionPane.CANCEL_OPTION) { dialog.dispose(); return false; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/action/ImportAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/action/ImportAction.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/action/ImportAction.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -28,7 +28,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.util.ZipUtil; +import org.nuiton.util.ZipUtil; import fr.ifremer.isisfish.ui.script.FileSelectionTableModel; import fr.ifremer.isisfish.ui.util.IsisActionWithBackup; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -48,9 +48,9 @@ import javax.swing.text.JTextComponent; import jaxx.runtime.JAXXInitialContext; import jaxx.runtime.swing.JAXXList; -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.math.matrix.gui.JAXXMatrixEditor; -import org.codelutin.topia.persistence.TopiaEntity; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.math.matrix.gui.JAXXMatrixEditor; +import org.nuiton.topia.persistence.TopiaEntity; import fr.ifremer.isisfish.ui.input.RangeOfValuesUI; import fr.ifremer.isisfish.ui.input.SelectivityEditorUI; import java.util.ArrayList; @@ -59,7 +59,7 @@ import jaxx.runtime.swing.editor.NumberEditor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.gui.MatrixEditor; +import org.nuiton.math.matrix.gui.MatrixEditor; /** * Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx 2009-10-13 15:00:50 UTC (rev 2658) @@ -22,7 +22,7 @@  <fr.ifremer.isisfish.entities.Formule id='formule' javaBean='null'/> <String id='lblText' javaBean='null'/> - <org.codelutin.topia.persistence.TopiaEntity id='bean' javaBean='null'/> + <org.nuiton.topia.persistence.TopiaEntity id='bean' javaBean='null'/> <Class id='clazz' javaBean='null'/> <String id='methodGet' javaBean='null'/> <String id='methodSet' javaBean='null'/> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -18,7 +18,7 @@ package fr.ifremer.isisfish.ui.sensitivity; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import fr.ifremer.isisfish.ui.simulator.SimulAction; @@ -30,8 +30,8 @@ import javax.swing.JOptionPane; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.topia.persistence.TopiaEntity; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.topia.persistence.TopiaEntity; /** * Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeCellRenderer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeCellRenderer.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeCellRenderer.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -18,7 +18,7 @@ package fr.ifremer.isisfish.ui.sensitivity; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.awt.Component; import java.util.List; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx 2009-10-13 15:00:50 UTC (rev 2658) @@ -28,7 +28,7 @@ <script><![CDATA[ import org.apache.commons.lang.StringUtils; -import org.codelutin.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaEntity; import fr.ifremer.isisfish.ui.simulator.SimulAction; import fr.ifremer.isisfish.ui.input.InputSaveVerifier; import fr.ifremer.isisfish.simulator.sensitivity.Factor; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,7 +19,7 @@ --> <ContinuousPanelContainerUI> - <org.codelutin.math.matrix.MatrixND id='matrix' javaBean='null'/> + <org.nuiton.math.matrix.MatrixND id='matrix' javaBean='null'/> <Table id='content' constraints='BorderLayout.CENTER'> <row> @@ -27,7 +27,7 @@ <JLabel text='isisfish.factor.value' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> </cell> <cell fill='both' weightx='1' weighty='1'> - <org.codelutin.math.matrix.gui.JAXXMatrixEditor id='componentPanel' dimensionEdit='{false}' + <org.nuiton.math.matrix.gui.JAXXMatrixEditor id='componentPanel' dimensionEdit='{false}' matrix='{getMatrix() == null ? null : getMatrix().clone()}' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> </cell> 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-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -18,7 +18,7 @@ package fr.ifremer.isisfish.ui.sensitivity; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import fr.ifremer.isisfish.entities.Cell; import fr.ifremer.isisfish.entities.FisheryRegion; import fr.ifremer.isisfish.entities.Gear; @@ -42,7 +42,7 @@ import jaxx.runtime.swing.navigation.NavigationTreeSelectionAdapterWithCardLayout; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaEntity; import javax.swing.JPanel; import javax.swing.event.TreeSelectionEvent; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx 2009-10-13 15:00:50 UTC (rev 2658) @@ -21,7 +21,7 @@ <script><![CDATA[ import java.util.ArrayList; import java.io.File; - import org.codelutin.util.FileUtil; + import org.nuiton.util.FileUtil; import fr.ifremer.isisfish.ui.simulator.SimulAction; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.simulator.launcher.SimulationService; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-10-13 15:00:50 UTC (rev 2658) @@ -22,8 +22,8 @@ <Boolean id='sensitivity' javaBean='false'/> <script><![CDATA[ -import org.codelutin.topia.TopiaException; -import org.codelutin.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.TopiaContext; import java.text.ParseException; import fr.ifremer.isisfish.datastore.RegionStorage; import fr.ifremer.isisfish.datastore.StorageChangeEvent; @@ -577,7 +577,7 @@ <cell columns="4" fill="both" weightx="1.0" weighty="0.6"> <JTabbedPane id="parametersTabbedPane" minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> <tab title='{_("isisfish.params.populationNumbers")}'> - <org.codelutin.math.matrix.gui.JAXXMatrixEditor id="simulParamsNumbers" name="isisfish.params.populationNumbers"/> + <org.nuiton.math.matrix.gui.JAXXMatrixEditor id="simulParamsNumbers" name="isisfish.params.populationNumbers"/> </tab> <tab title='{_("isisfish.params.ruleParameters")}'> <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,7 +19,7 @@ package fr.ifremer.isisfish.ui.simulator; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.File; import java.io.FileInputStream; @@ -40,14 +40,11 @@ import javax.swing.JComponent; -import jaxx.runtime.swing.ErrorDialogUI; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.log.UserLog; -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.topia.TopiaContext; -import org.codelutin.util.FileUtil; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.topia.TopiaContext; +import org.nuiton.util.FileUtil; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishException; @@ -81,6 +78,7 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; import fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil; +import fr.ifremer.isisfish.ui.util.ErrorHelper; import fr.ifremer.isisfish.ui.widget.filter.FilterModel; /** @@ -122,10 +120,6 @@ init(); } - protected void showMsgBox(Exception eee) { - ErrorDialogUI.showError(eee); - } - /** * cree et initialise param avec les valeurs par defaut de l'utilisateur */ @@ -153,7 +147,7 @@ if (log.isErrorEnabled()) { log.error("Can't init SimulationParameter", eee); } - showMsgBox(eee); + ErrorHelper.showErrorDialog(_("isisfish.error.simulation.initsimulaction"), eee); } // factors has been requested to be sorted @@ -183,7 +177,7 @@ if (log.isErrorEnabled()) { log.error("Can't import simulation", e); } - showMsgBox(e); + ErrorHelper.showErrorDialog(_("isisfish.error.simulation.importparameter"), e); } finally { try { fos.close(); @@ -191,7 +185,7 @@ if (log.isErrorEnabled()) { log.error("Can't import simulation", e); } - showMsgBox(e); + ErrorHelper.showErrorDialog(_("isisfish.error.simulation.importparameter"), e); } } } @@ -212,7 +206,7 @@ if (log.isErrorEnabled()) { log.error("Can't save simulation", e); } - showMsgBox(e); + ErrorHelper.showErrorDialog(_("isisfish.error.simulation.savesimulation"), e); } finally { try { if (fos != null) { @@ -222,7 +216,7 @@ if (log.isErrorEnabled()) { log.error("Can't save simulation", e); } - showMsgBox(e); + ErrorHelper.showErrorDialog(_("isisfish.error.simulation.savesimulation"), e); } } } @@ -247,7 +241,7 @@ if (log.isWarnEnabled()) { log.warn("Can't find result name script", eee); } - showMsgBox(eee); + ErrorHelper.showErrorDialog(_("isisfish.error.simulation.getresultname"), eee); } return result; } @@ -274,7 +268,7 @@ if (log.isErrorEnabled()) { log.error("Can't change region", e); } - showMsgBox(e); + ErrorHelper.showErrorDialog(_("isisfish.error.simulation.openregion"), e); } } @@ -327,7 +321,7 @@ if (log.isErrorEnabled()) { log.error("Can't load old Simulation: " + simulName, eee); } - showMsgBox(eee); + ErrorHelper.showErrorDialog(_("isisfish.error.simulation.loadoldsimulation"), eee); } } @@ -362,7 +356,7 @@ if (log.isErrorEnabled()) { log.error("Can't add rule", e); } - showMsgBox(e); + ErrorHelper.showErrorDialog(_("isisfish.error.simulation.addrule"), e); } } @@ -406,7 +400,7 @@ if (log.isErrorEnabled()) { log.error("Can't get strategies", e); } - showMsgBox(e); + ErrorHelper.showErrorDialog(_("isisfish.error.simulation.liststrategies"), e); } return result; } @@ -445,7 +439,7 @@ if (log.isErrorEnabled()) { log.error("Can't get population", e); } - showMsgBox(e); + ErrorHelper.showErrorDialog(_("isisfish.error.simulation.listpopulation"), e); } return result; } @@ -502,12 +496,12 @@ if (log.isErrorEnabled()) { log.error("Can't get old simulation item", e); } - showMsgBox(e); + ErrorHelper.showErrorDialog(_("isisfish.error.simulation.listoldsimulation"), e); } catch (IOException e) { if (log.isErrorEnabled()) { log.error("Can't get old simulation item", e); } - showMsgBox(e); + ErrorHelper.showErrorDialog(_("isisfish.error.simulation.listoldsimulation"), e); } return null; } @@ -641,7 +635,7 @@ if (log.isErrorEnabled()) { log.error("Can't add analyse plan", e); } - showMsgBox(e); + ErrorHelper.showErrorDialog(_("isisfish.error.simulation.addanalyseplan"), e); } } @@ -670,7 +664,7 @@ if (log.isErrorEnabled()) { log.error("Can't get analyse plan param value", e); } - showMsgBox(e); + ErrorHelper.showErrorDialog(_("isisfish.error.simulation.getparametervalue"), e); } } return result; @@ -688,7 +682,7 @@ if (log.isErrorEnabled()) { log.error("Can't set analyse plan param value", e); } - showMsgBox(e); + ErrorHelper.showErrorDialog(_("isisfish.error.simulation.setparametervalue"), e); } } @@ -968,8 +962,8 @@ if ("".equals(fullSimulationId) || SimulationStorage.localyExists(fullSimulationId) || SimulationService.getService().exists(fullSimulationId)) { - UserLog.error(_("isisfish.simulator.simulaction.badid", - fullSimulationId)); + ErrorHelper.showErrorDialog(_("isisfish.simulator.simulaction.badid", + fullSimulationId), null); } else { SimulationParameter p = param.copy(); @@ -980,7 +974,7 @@ if (log.isErrorEnabled()) { log.error("Can't start simulation", eee); } - showMsgBox(eee); + ErrorHelper.showErrorDialog(_("isisfish.error.simulation.launchsimulation"), eee); } } @@ -1015,8 +1009,8 @@ if ("".equals(fullSimulationId) || SimulationStorage.localyExists(fullSimulationId) || SimulationService.getService().exists(fullSimulationId)) { - UserLog.error(_("isisfish.simulator.simulaction.badid", - fullSimulationId)); + ErrorHelper.showErrorDialog(_("isisfish.simulator.simulaction.badid", + fullSimulationId), null); } else { SimulationParameter p = param.copy(); SimulationService.getService().submit(fullSimulationId, p, @@ -1026,7 +1020,7 @@ if (log.isErrorEnabled()) { log.error("Can't start simulation", eee); } - showMsgBox(eee); + ErrorHelper.showErrorDialog(_("isisfish.error.simulation.launchsimulation"), eee); } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulatorListeners.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulatorListeners.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulatorListeners.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -23,7 +23,7 @@ import fr.ifremer.isisfish.ui.widget.EnabledIfListNotEmpty; import fr.ifremer.isisfish.ui.widget.EnabledIfItemSelectedInList; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx 2009-10-13 15:00:50 UTC (rev 2658) @@ -80,13 +80,13 @@ <JLabel labelFor='{simulationStart}' text='isisfish.filter.simulation.simulationStart' toolTipText='isisfish.filter.simulation.tooltip.simulationStart'/> - <org.codelutin.widget.DatePicker + <org.nuiton.widget.DatePicker id="simulationStart" constructorParams="simpleDateFormat" columns='7' onFocusLost="doCheck()"/> <JLabel labelFor='{simulationEnd}' text='isisfish.filter.simulation.simulationEnd' toolTipText='isisfish.filter.simulation.tooltip.simulationEnd'/> - <org.codelutin.widget.DatePicker + <org.nuiton.widget.DatePicker id="simulationEnd" constructorParams="simpleDateFormat" columns='7' onFocusLost="doCheck()"/> </HBox> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterUtil.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterUtil.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterUtil.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -5,7 +5,7 @@ import fr.ifremer.isisfish.ui.widget.filter.FilterModel; import fr.ifremer.isisfish.ui.widget.filter.FilterParamModel; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/ErrorHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/ErrorHelper.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/ErrorHelper.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -0,0 +1,73 @@ +/* *##% + * 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.ui.util; + +import static org.nuiton.i18n.I18n._; + +import java.awt.Component; + +import org.jdesktop.swingx.JXErrorPane; +import org.jdesktop.swingx.error.ErrorInfo; + +/** + * Error helper. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class ErrorHelper { + + /** + * Display a user friendly error frame. + * + * @param parent parent component + * @param message message for user + * @param cause exception cause + */ + public static void showErrorDialog(Component parent, String message, + Throwable cause) { + + ErrorInfo info = new ErrorInfo(_("isisfish.error.errorpane.title"), + _("isisfish.error.errorpane.htmlmessage", message), null, null, + cause, null, null); + JXErrorPane.showDialog(parent, info); + } + + /** + * Display a user friendly error frame. + * + * @param message message for user + */ + public static void showErrorDialog(String message) { + showErrorDialog(null, message, null); + } + + /** + * Display a user friendly error frame. + * + * @param message message for user + * @param cause exception cause + */ + public static void showErrorDialog(String message, Throwable cause) { + showErrorDialog(null, message, cause); + } +} Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/ErrorHelper.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/CommitDialogUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/CommitDialogUI.jaxx 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/CommitDialogUI.jaxx 2009-10-13 15:00:50 UTC (rev 2658) @@ -3,8 +3,8 @@ <script> // FIXME a refaire -// import org.codelutin.vcs.ui.FieldModelUtil.ModuleFile; -// import org.codelutin.vcs.VCSFileState; +// import org.nuiton.vcs.ui.FieldModelUtil.ModuleFile; +// import org.nuiton.vcs.VCSFileState; // protected ModuleFile<VCSFileState> model; protected Object model; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateConfirmDialogUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateConfirmDialogUI.jaxx 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateConfirmDialogUI.jaxx 2009-10-13 15:00:50 UTC (rev 2658) @@ -3,8 +3,8 @@ // FIXME a refaire -// import org.codelutin.vcs.ui.FieldModelUtil.ModuleFile; -// import org.codelutin.vcs.VCSFileState; +// import org.nuiton.vcs.ui.FieldModelUtil.ModuleFile; +// import org.nuiton.vcs.VCSFileState; // protected ModuleFile<VCSFileState> model; protected Object model; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateDialogUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateDialogUI.jaxx 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateDialogUI.jaxx 2009-10-13 15:00:50 UTC (rev 2658) @@ -2,10 +2,10 @@ <script> // FIXME a refaire -// import static org.codelutin.vcs.VCSState.*; -// import org.codelutin.vcs.VCSState; +// import static org.nuiton.vcs.VCSState.*; +// import org.nuiton.vcs.VCSState; -// protected org.codelutin.vcs.VCSRepositoryState model; +// protected org.nuiton.vcs.VCSRepositoryState model; protected Object model; public void doCheckAll() { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx 2009-10-13 15:00:50 UTC (rev 2658) @@ -2,7 +2,7 @@ <script><![CDATA[ import com.jcraft.jsch.JSch; import com.jcraft.jsch.KeyPair; - import org.codelutin.util.FileUtil; + import org.nuiton.util.FileUtil; import java.io.File; import java.io.IOException; import java.util.ArrayList; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/VCSConnectionState.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/VCSConnectionState.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/VCSConnectionState.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -24,7 +24,7 @@ import javax.swing.JLabel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.util.Resource; +import org.nuiton.util.Resource; /** * VCSConnectionState. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -33,7 +33,7 @@ import javax.swing.event.ChangeEvent; import javax.swing.table.TableCellEditor; -import org.codelutin.widget.SwingUtil; +import org.nuiton.widget.SwingUtil; import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.entities.Equation; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterColumnEditor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterColumnEditor.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterColumnEditor.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -40,10 +40,10 @@ import org.apache.commons.beanutils.ConvertUtilsBean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.persistence.TopiaEntity; -import org.codelutin.util.MonthEnum; -import org.codelutin.util.EnumEditor; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.util.MonthEnum; +import org.nuiton.util.EnumEditor; import fr.ifremer.isisfish.datastore.RegionStorage; import fr.ifremer.isisfish.types.Date; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -40,10 +40,10 @@ import org.apache.commons.beanutils.ConvertUtilsBean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.persistence.TopiaEntity; -import org.codelutin.util.EnumEditor; -import org.codelutin.util.MonthEnum; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.util.EnumEditor; +import org.nuiton.util.MonthEnum; import fr.ifremer.isisfish.datastore.RegionStorage; import fr.ifremer.isisfish.types.Date; 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-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx 2009-10-13 15:00:50 UTC (rev 2658) @@ -9,8 +9,8 @@ import java.io.PrintWriter; import java.io.StringWriter; - import org.codelutin.widget.DatePicker; - import org.codelutin.widget.InvalidDateException; + import org.nuiton.widget.DatePicker; + import org.nuiton.widget.InvalidDateException; /** filter model */ protected fr.ifremer.isisfish.ui.widget.filter.FilterModel model; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx 2009-10-13 15:00:50 UTC (rev 2658) @@ -1,7 +1,7 @@ <JPanel> <script> - import org.codelutin.widget.DatePicker; - import org.codelutin.widget.InvalidDateException; + import org.nuiton.widget.DatePicker; + import org.nuiton.widget.InvalidDateException; protected fr.ifremer.isisfish.ui.widget.filter.FilterDialogUI dialog; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ClasspathTemplateLoader.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ClasspathTemplateLoader.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ClasspathTemplateLoader.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -22,8 +22,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.util.Resource; -import org.codelutin.util.ResourceNotFoundException; +import org.nuiton.util.Resource; +import org.nuiton.util.ResourceNotFoundException; import freemarker.cache.URLTemplateLoader; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,7 +19,7 @@ package fr.ifremer.isisfish.util; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import info.monitorenter.cpdetector.io.ASCIIDetector; import info.monitorenter.cpdetector.io.ByteOrderMarkDetector; import info.monitorenter.cpdetector.io.CodepageDetectorProxy; @@ -55,7 +55,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.util.FileUtil; +import org.nuiton.util.FileUtil; import com.sun.tools.javac.api.JavacTool; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ConverterUtil.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ConverterUtil.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ConverterUtil.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -21,10 +21,10 @@ import org.apache.commons.beanutils.BeanUtilsBean; import org.apache.commons.beanutils.ConvertUtilsBean; -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.math.matrix.MatrixNDImpl; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.persistence.TopiaEntity; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.math.matrix.MatrixNDImpl; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.persistence.TopiaEntity; import fr.ifremer.isisfish.types.Date; import fr.ifremer.isisfish.types.Month; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/DocHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/DocHelper.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/DocHelper.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,7 +19,7 @@ package fr.ifremer.isisfish.util; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,7 +19,7 @@ package fr.ifremer.isisfish.util; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.File; import java.io.IOException; @@ -32,7 +32,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.util.FileUtil; +import org.nuiton.util.FileUtil; import fr.ifremer.isisfish.IsisConfig; import fr.ifremer.isisfish.IsisFishRuntimeException; @@ -216,7 +216,7 @@ content += "package " + packageName + ";"; } content += "import fr.ifremer.isisfish.entities.*;"; - content += "import org.codelutin.math.matrix.*;"; + content += "import org.nuiton.math.matrix.*;"; content += "import fr.ifremer.isisfish.types.Date;"; content += "import fr.ifremer.isisfish.types.Month;"; content += "import fr.ifremer.isisfish.types.RangeOfValues;"; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -27,7 +27,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.util.FileUtil; +import org.nuiton.util.FileUtil; import com.sun.tools.doclets.standard.Standard; import com.sun.tools.javadoc.Main; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/MatrixConverter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/MatrixConverter.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/MatrixConverter.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -21,9 +21,9 @@ import org.apache.commons.beanutils.ConversionException; import org.apache.commons.beanutils.Converter; import org.apache.commons.lang.StringEscapeUtils; -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.math.matrix.MatrixStringEncoder; -import org.codelutin.topia.persistence.TopiaEntity; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.math.matrix.MatrixStringEncoder; +import org.nuiton.topia.persistence.TopiaEntity; /** * Classe utilisées pour convertir des matrices en string et vice-versa. @@ -58,7 +58,7 @@ } /* - * @see org.codelutin.math.matrix.MatrixStringEncoder#getQualifiedName(java.lang.Object) + * @see org.nuiton.math.matrix.MatrixStringEncoder#getQualifiedName(java.lang.Object) */ @Override public String getQualifiedName(Object o) { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/StringConverter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/StringConverter.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/StringConverter.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -20,8 +20,8 @@ import org.apache.commons.beanutils.Converter; import org.apache.commons.lang.StringEscapeUtils; -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.topia.persistence.TopiaEntity; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.topia.persistence.TopiaEntity; import fr.ifremer.isisfish.types.Date; import fr.ifremer.isisfish.types.Month; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/TopiaEntityConverter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/TopiaEntityConverter.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/TopiaEntityConverter.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -37,10 +37,10 @@ import org.apache.commons.beanutils.Converter; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.TopiaException; -import org.codelutin.topia.persistence.TopiaEntity; -import org.codelutin.topia.persistence.TopiaId; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaId; import org.hibernate.Hibernate; import org.hibernate.HibernateException; import org.hibernate.engine.QueryParameters; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHAgent.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHAgent.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHAgent.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -18,7 +18,7 @@ package fr.ifremer.isisfish.util.ssh; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.File; import java.util.HashMap; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCS.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCS.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCS.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -22,7 +22,7 @@ import java.util.List; import java.util.Map; -import org.codelutin.util.VersionNumber; +import org.nuiton.util.VersionNumber; /** * Version control system. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSFactory.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSFactory.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSFactory.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -21,7 +21,7 @@ import fr.ifremer.isisfish.IsisConfig; import java.io.File; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.util.Properties; import org.apache.commons.beanutils.ConstructorUtils; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSNone.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSNone.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSNone.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -23,7 +23,7 @@ import java.util.List; import java.util.Map; -import org.codelutin.util.VersionNumber; +import org.nuiton.util.VersionNumber; /** * VCSNone (svn or vcs) must extends this class. This class can be used as dummy Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -17,7 +17,7 @@ package fr.ifremer.isisfish.vcs; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.ByteArrayOutputStream; import java.io.File; @@ -32,7 +32,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.util.VersionNumber; +import org.nuiton.util.VersionNumber; import org.tmatesoft.svn.core.ISVNDirEntryHandler; import org.tmatesoft.svn.core.SVNCommitInfo; import org.tmatesoft.svn.core.SVNDepth; @@ -507,7 +507,7 @@ } /* - * @see org.codelutin.isisfish.vcs.VCS#checkout(org.codelutin.util.VersionNumber, boolean) + * @see org.nuiton.isisfish.vcs.VCS#checkout(org.nuiton.util.VersionNumber, boolean) */ @Override public void checkout(VersionNumber tag, boolean recurse) @@ -811,7 +811,7 @@ } /* - * @see org.codelutin.isisfish.vcs.VCS#getFileList(java.io.File) + * @see org.nuiton.isisfish.vcs.VCS#getFileList(java.io.File) */ @Override public List<String> getFileList(File directory) throws VCSException { @@ -1020,7 +1020,7 @@ } /* - * @see org.codelutin.isisfish.vcs.VCS#update(java.io.File, boolean) + * @see org.nuiton.isisfish.vcs.VCS#update(java.io.File, boolean) */ @Override public List<File> update(File file, boolean recurse) throws VCSException { @@ -1081,7 +1081,7 @@ } /* - * @see org.codelutin.isisfish.vcs.VCS#isWriteable() + * @see org.nuiton.isisfish.vcs.VCS#isWriteable() */ @Override public boolean isWriteable() throws VCSException { @@ -1106,7 +1106,7 @@ } /* - * @see org.codelutin.isisfish.vcs.VCS#isTag(org.codelutin.util.VersionNumber) + * @see org.nuiton.isisfish.vcs.VCS#isTag(org.nuiton.util.VersionNumber) */ @Override public boolean isTag(VersionNumber version) throws VCSException { @@ -1128,7 +1128,7 @@ } /* - * @see org.codelutin.isisfish.vcs.VCS#getTag() + * @see org.nuiton.isisfish.vcs.VCS#getTag() */ @Override public String getTag() throws VCSException { @@ -1152,7 +1152,7 @@ } /* - * @see org.codelutin.isisfish.vcs.VCS#setTag(org.codelutin.util.VersionNumber) + * @see org.nuiton.isisfish.vcs.VCS#setTag(org.nuiton.util.VersionNumber) */ @Override public List<File> setTag(VersionNumber version) throws VCSException { 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-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-10-13 15:00:50 UTC (rev 2658) @@ -4,7 +4,9 @@ Can't\ add\ result\ '%1$s'\ at\ date\ %2$s=Can't add result '%1$s' at date %2$s Can't\ add\ simulation\:\ %s= Can't\ create\ simulation\ logger=Can't create simulation logger +Can't\ delete\ simulation= Can't\ delete\ simulation\ %s\ = +Can't\ display\ simulation\ log= Can't\ do\ post\ action\ %s= Can't\ do\ simulation\ %s= Can't\ download\ archive\ \:\ %s= @@ -17,6 +19,7 @@ Can't\ instanciate\ wanted\ VCS\ (%s),\ use\ default= Can't\ instantiate\ %s= Can't\ open\ log\ for\ %s= +Can't\ open\ simulation\ internal\ frame= Can't\ read\ ssh\ key\ \:\ %s= Can't\ simulate\ %s= Check\ state\ of\ local\ repository\:\ %s= @@ -66,7 +69,6 @@ destination\ already\ exists\ %s\ use\ \\'force\\'\ argument\ to\ force\ overwrite= directory\ %s\ must\ be\ a\ directory= filter\ loaded\ in\ %1$s\ ms\ \:\ found\ %2$s\ lines.=filter loaded in %1$s ms \: found %2$s lines. -in\ hour= isisfish.about.abouthtmltext=<html><b>Isis-Fish (%s)</b><br /><br />Copyright IFREMER-MAERHA 2000-2009.<br /><br /><a href\="http\://isis-fish.labs.libre-entreprise.org">http\://isis-fish.labs.libre-entreprise.org</a><br /><br />Please, report any bug you can found.<html> isisfish.about.licensetext=You can modify and redistribute the program under the conditions of the GNU General Public License (version 2 or later). A copy of the GPL is in the file "LICENSE.txt" provided with Isis-Fish. All rights reserved. No guarantees are provided for use of this program. isisfish.about.title=About Isis-Fish... @@ -96,6 +98,7 @@ isisfish.common.date=Date isisfish.common.debug=debug isisfish.common.delete=Delete +isisfish.common.duration.inhours=in hours isisfish.common.ellipsis=... isisfish.common.emigration=Emigration isisfish.common.equation=Equation @@ -233,7 +236,6 @@ isisfish.error.add.tray=Can't add system tray icon isisfish.error.change.classloader=Can't change classloader because can't create URL from file %1$s isisfish.error.change.equation=Can't change equation -isisfish.error.check.region= isisfish.error.compile.fileerror=File %s can't be compiled \! isisfish.error.compile.script=Can't compile script\: %1$s isisfish.error.compiled.parameter=Can't get rule parameter from compiled class @@ -258,7 +260,11 @@ isisfish.error.empty.species=specie capturable empty isisfish.error.empty.species.name=specie's name is empty isisfish.error.empty.unit=measure unit is empty +isisfish.error.equation.openeditor=Can't open equation editor isisfish.error.equation.return.number=EquationImpl must retun a number\: %1$s +isisfish.error.equation.savemodel=Can't save equation as model +isisfish.error.errorpane.htmlmessage=<html><b>IsisFish has handled \:</b><br />%s</b></html> +isisfish.error.errorpane.title=Error isisfish.error.evaluate.equation=Can't evaluate equation\: %1$s isisfish.error.evaluate.preplan.script= isisfish.error.evalute.plan.script=Can't evaluate plan script @@ -272,18 +278,25 @@ isisfish.error.import.recent.files=Erreur lors de l'import, la version du fichier que vous souhaitez importer est plus r\u00E9cente que la version souhait\u00E9e. isisfish.error.init.map=Can't init map. isisfish.error.init.remove.button=could not init remove button (button or list is null) button \: %1$s, list \: %2$s +isisfish.error.input.addentity=Can't add entity "%s" +isisfish.error.input.cancelentity=Can't cancel modification on entity +isisfish.error.input.createentity=Can't create entity +isisfish.error.input.removeentity=Can't remove entity "%s" +isisfish.error.input.save=Can't save modifications +isisfish.error.input.saveentity=Can't save entity +isisfish.error.input.spacializematrix= isisfish.error.instanciate=Can't instanciate %1$s isisfish.error.instanciate.export=Can't instanciate export %1$s isisfish.error.invalid.costs.fix=les co\u00FBts fixes sont invalides isisfish.error.invalid.distribution.recruitment=distribution de recrutement invalide -isisfish.error.invalid.equation=Equation invalid +isisfish.error.invalid.equation=Invalid equation isisfish.error.invalid.equation.name=Invalid equation name isisfish.error.invalid.file.name=The script name %1$s is not valid. isisfish.error.invalid.interval.reproduction.recruitment=interval entre la reproduction et le recrutement invalide -isisfish.error.invalid.mean.weight=poids moyen invalide +isisfish.error.invalid.mean.weight=Invalid mean weight isisfish.error.invalid.natural.death=natural mortality on classes naissantes invalide isisfish.error.invalid.nullequation=Equation %s doesn't exist \! -isisfish.error.invalid.number=the number is invalid +isisfish.error.invalid.number=The number is invalid isisfish.error.invalid.range=La gamme possible n'a pas de valeur acceptable isisfish.error.invalid.values.params=Parametre controlable hors valeurs possibles isisfish.error.invalidate.natural.death=natural mortality invalid @@ -300,18 +313,18 @@ isisfish.error.log.foundAppender=\=could not found log appender %1$s for category %2$s isisfish.error.matrix.more.2d=Matrice de plus de 2 dimensions\!\!\nS\u00E9lectionnez moins d'\u00E9l\u00E9ments ou utilisez l'op\u00E9rateur somme. isisfish.error.migration.negative=Migration negative -isisfish.error.no.matrix=No matrix for\: +isisfish.error.no.matrix=No matrix for \: %s isisfish.error.no.null.time.step=Error, the time step should not be null isisfish.error.no.sector=No sector defined -isisfish.error.no.select.simulation=could not select simulation -isisfish.error.no.target.species=no target species in %1$s for %2$s -isisfish.error.not.found.code=could not found codeclass for %1$s -isisfish.error.not.found.description=could not found description for %1$s -isisfish.error.not.found.field=could not found field %1$s doc for %2$s -isisfish.error.not.found.field.class=could not found field %1$s for class %2$s -isisfish.error.not.null.class.grown=classe mature vaut nul -isisfish.error.not.null.mean.weight=poids moyen nul -isisfish.error.not.null.natiral.death=natural mortality null +isisfish.error.no.select.simulation=Could not select simulation +isisfish.error.no.target.species=No target species in %1$s for %2$s +isisfish.error.not.found.code=Could not found codeclass for %1$s +isisfish.error.not.found.description=Could not found description for %1$s +isisfish.error.not.found.field=Could not found field %1$s doc for %2$s +isisfish.error.not.found.field.class=Could not found field %1$s for class %2$s +isisfish.error.not.null.class.grown=Null value for grown class +isisfish.error.not.null.mean.weight=Null mean weight +isisfish.error.not.null.natural.death=Null natural mortality isisfish.error.not.possible.metier=Pas de m\u00E9tier possible isisfish.error.not.support.class=this class does not support isisfish.error.number.classes.upper.zero=Error, the number of classes must be upper than 0 @@ -324,12 +337,24 @@ isisfish.error.prepare.information.simulation=Can't prepare information for simulation isisfish.error.read.simulation=Can't read simulation information %1$s isisfish.error.read.simulation.parameters=Can't read simulation parameters from file %1$s +isisfish.error.region.addmap=Can't add map in region isisfish.error.region.already.exists=This region already exists +isisfish.error.region.cancel= +isisfish.error.region.check=Can't check region +isisfish.error.region.commit=Can't commit region +isisfish.error.region.copy=Can't copy region +isisfish.error.region.create=Can't create new region +isisfish.error.region.export=Can't export region +isisfish.error.region.import=Can't import region +isisfish.error.region.load=Can't load region isisfish.error.region.name.empty=Region name is empty +isisfish.error.region.new= +isisfish.error.region.remove=Can't remove region +isisfish.error.region.removemap=Can't remove map in region +isisfish.error.region.save=Can't save modification on region isisfish.error.remove.directory=Can't remove directory %1$s isisfish.error.rename.region=Can't rename region to %1$s isisfish.error.save.checkSum.compilation=Can't save checkSum to compilation\: %1$s -isisfish.error.save.region= isisfish.error.save.script.compilation=Can't save script to compilation\: %1$s isisfish.error.save.simulation.parameters=Can't save simulation parameters in file %1$s isisfish.error.script.create=isisfish.error.script.create @@ -337,13 +362,26 @@ isisfish.error.script.import=Can't import file for reason %1$s isisfish.error.script.load=Can't load file %1$s for reason %2$s isisfish.error.script.save=Can't save file %1$s for reason %2$s -isisfish.error.sensitivity.parameter= +isisfish.error.simulation.addanalyseplan=Can't add analyze plan +isisfish.error.simulation.addrule=Can't add rule +isisfish.error.simulation.getparametervalue=Can't get parameter value +isisfish.error.simulation.getresultname=Can't get result names list +isisfish.error.simulation.importparameter=Can't import simulation parameters +isisfish.error.simulation.initsimulaction=Can't init simulation +isisfish.error.simulation.launchsimulation=Can't launch simulation +isisfish.error.simulation.listoldsimulation=Can't get old simulation list +isisfish.error.simulation.listpopulation=Can't get population list +isisfish.error.simulation.liststrategies=Can't get strategies list +isisfish.error.simulation.loadoldsimulation=Can't load old simulation isisfish.error.simulation.log.openAppender=could not open appender of simulation %1$s for reason %2$s +isisfish.error.simulation.openregion=Can't open region isisfish.error.simulation.remote.global=Can't launch a simulation on remote server isisfish.error.simulation.remote.wrongportvalue=Connection port value is incorrect \: %s isisfish.error.simulation.resultXml.close=Can't close simulation result XML for reason %1$s isisfish.error.simulation.resultXml.open=Can't open simulation result XML for reason %1$s isisfish.error.simulation.resultXml.write=Can't write simulation result XML for reason %1$s +isisfish.error.simulation.savesimulation=Can't save simulation parameters +isisfish.error.simulation.setparametervalue=Can't set parameter value isisfish.error.source.parameter=Can't get parameter from source isisfish.error.strategy.order=Strategy %1$s don't have 12 StrategyMonthInfo but %2$s. Recreate them isisfish.error.undefined.classes=No classes defined @@ -644,6 +682,7 @@ isisfish.metierSeasonInfoZone.season=Season isisfish.metierSeasonInfoZone.selectSeason=Select a season isisfish.metierSeasonInfoZone.title=Seasons / Zones +isisfish.misc.nuitonmigration=IsisFish has detected some code based on CodeLutin libraries in following user scripts.\nDo you want to migrate those script on new nuiton libraries ? isisfish.monitor.title=Application Monitor isisfish.month.april=april isisfish.month.august=august @@ -1073,7 +1112,7 @@ isisfish.welcome.menu.help.isisfish=Isis-Fish Website isisfish.welcome.menu.help.isisfishapi=Isis-Fish API isisfish.welcome.menu.help.javaapi=Java API -isisfish.welcome.menu.help.lutinmatrixapi=LutinMatrix API +isisfish.welcome.menu.help.matrixapi=NuitonMatrix API isisfish.welcome.menu.help.topiaapi=ToPIA API isisfish.welcome.menu.input=Input isisfish.welcome.menu.monitor=Logs frame 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-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-10-13 15:00:50 UTC (rev 2658) @@ -4,7 +4,9 @@ Can't\ add\ result\ '%1$s'\ at\ date\ %2$s=Can't add result '%1$s' at date %2$s Can't\ add\ simulation\:\ %s= Can't\ create\ simulation\ logger=Can't create simulation logger +Can't\ delete\ simulation= Can't\ delete\ simulation\ %s\ = +Can't\ display\ simulation\ log= Can't\ do\ post\ action\ %s= Can't\ do\ simulation\ %s= Can't\ download\ archive\ \:\ %s= @@ -17,6 +19,7 @@ Can't\ instanciate\ wanted\ VCS\ (%s),\ use\ default= Can't\ instantiate\ %s= Can't\ open\ log\ for\ %s= +Can't\ open\ simulation\ internal\ frame= Can't\ read\ ssh\ key\ \:\ %s= Can't\ simulate\ %s= Check\ state\ of\ local\ repository\:\ %s= @@ -66,7 +69,6 @@ destination\ already\ exists\ %s\ use\ \\'force\\'\ argument\ to\ force\ overwrite= directory\ %s\ must\ be\ a\ directory= filter\ loaded\ in\ %1$s\ ms\ \:\ found\ %2$s\ lines.=filter loaded in %1$s ms \: found %2$s lines. -in\ hour= isisfish.about.abouthtmltext=<html><b>Isis-Fish (%s)</b><br /><br />Copyright IFREMER-MAERHA 2000-2009.<br /><br /><a href\="http\://isis-fish.labs.libre-entreprise.org">http\://isis-fish.labs.libre-entreprise.org</a><br /><br />Merci de rapporter les bugs.<html> isisfish.about.licensetext=Vous pouvez modifier et redistribuer ce programme sous les conditions \u00E9nonc\u00E9es par la licence GNU GPL (version 2 ou ult\u00E9rieure). Une copie de la licence GPL est dans le fichier \u00AB\u00A0LICENSE.txt\u00A0\u00BB fourni avec Isis-Fish. Tous droits r\u00E9serv\u00E9s. Aucune garantie n'est fournie pour l'utilisation de ce programme. isisfish.about.title=\u00C0 propos de Isis-Fish... @@ -96,6 +98,7 @@ isisfish.common.date=Date isisfish.common.debug=Debug isisfish.common.delete=Supprimer +isisfish.common.duration.inhours=En heures isisfish.common.ellipsis=... isisfish.common.emigration=\u00E9migration isisfish.common.equation=Equation @@ -233,7 +236,6 @@ isisfish.error.add.tray=Impossible d'ajouter une icone de notification isisfish.error.change.classloader=Can't change classloader because can't create URL from file %1$s isisfish.error.change.equation=Can't change equation -isisfish.error.check.region= isisfish.error.compile.fileerror=Le fichier %s contient des erreurs \! isisfish.error.compile.script=Impossible de compiler le script \: %s isisfish.error.compiled.parameter=Can't get rule parameter from compiled class @@ -258,7 +260,11 @@ isisfish.error.empty.species=espece capturable vide isisfish.error.empty.species.name=le nom d'espece est vide isisfish.error.empty.unit=l'unit\u00E9 de mesure est vide +isisfish.error.equation.openeditor=Impossible d'ouvrir l'editeur d'\u00E9quation isisfish.error.equation.return.number=EquationImpl must retun a number\: %1$s +isisfish.error.equation.savemodel=Impossible de sauver l'\u00E9quation en tant que mod\u00E8le +isisfish.error.errorpane.htmlmessage=IsisFish a d\u00E9tect\u00E9 une erreur \: +isisfish.error.errorpane.title=Erreur isisfish.error.evaluate.equation=Can't evaluate equation\: %1$s isisfish.error.evaluate.preplan.script= isisfish.error.evalute.plan.script=Can't evaluate plan script @@ -272,6 +278,13 @@ isisfish.error.import.recent.files=Erreur lors de l'import, la version du fichier que vous souhaitez importer est plus r\u00E9cente que la version souhait\u00E9e. isisfish.error.init.map=Can't init map. isisfish.error.init.remove.button=could not init remove button (button or list is null) button \: %1$s, list \: %2$s +isisfish.error.input.addentity=Impossible d'ajouter l'entit\u00E9 "%s" +isisfish.error.input.cancelentity=Impossible d'annuler les modifications +isisfish.error.input.createentity=Impossible de cr\u00E9er une nouvelle entit\u00E9 +isisfish.error.input.removeentity=Impossible de supprimer l'entit\u00E9 "%s" +isisfish.error.input.save=Impossible de sauver les modifications +isisfish.error.input.saveentity=Impossible de sauver les modifications +isisfish.error.input.spacializematrix= isisfish.error.instanciate=Can't instanciate %1$s isisfish.error.instanciate.export=Can't instanciate export %1$s isisfish.error.invalid.costs.fix=les co\u00FBts fixes sont invalides @@ -300,7 +313,7 @@ isisfish.error.log.foundAppender=n'a pas trouve l'appender %1$s pour la categorie %2$s isisfish.error.matrix.more.2d=Matrice de plus de 2 dimensions\!\!\nS\u00E9lectionnez moins d'\u00E9l\u00E9ments ou utilisez l'op\u00E9rateur somme. isisfish.error.migration.negative=Migration negative -isisfish.error.no.matrix=No matrix for\: +isisfish.error.no.matrix=Pas de matrice pour \: %s isisfish.error.no.null.time.step=Error, the time step should not be null isisfish.error.no.sector=il n'y a pas de secteur de d\u00E9finit isisfish.error.no.select.simulation=could not select simulation @@ -311,7 +324,7 @@ isisfish.error.not.found.field.class=could not found field %1$s for class %2$s isisfish.error.not.null.class.grown=classe mature vaut nul isisfish.error.not.null.mean.weight=poids moyen nul -isisfish.error.not.null.natiral.death=mortalite naturelle nulle +isisfish.error.not.null.natural.death=mortalite naturelle nulle isisfish.error.not.possible.metier=Pas de m\u00E9tier possible isisfish.error.not.support.class=La classe %s ne supporte pas les descritions isisfish.error.number.classes.upper.zero=Error, the number of classes must be upper than 0 @@ -324,12 +337,24 @@ isisfish.error.prepare.information.simulation=Can't prepare information for simulation isisfish.error.read.simulation=Can't read simulation information %1$s isisfish.error.read.simulation.parameters=Impossible de lire les param\u00EAtres du fichier \: %1$s +isisfish.error.region.addmap=Impossible d'ajouter une carte isisfish.error.region.already.exists=Cette r\u00E9gion existe d\u00E9j\u00E0 +isisfish.error.region.cancel= +isisfish.error.region.check=Impossible de v\u00E9rifier la r\u00E9gion +isisfish.error.region.commit=Impossible de committer la r\u00E9gion +isisfish.error.region.copy=Impossible de copier la r\u00E9gion +isisfish.error.region.create=Impossible de cr\u00E9er une nouvelle r\u00E9gion +isisfish.error.region.export=Impossible d'exporter la r\u00E9gion +isisfish.error.region.import=Impossible d'importer la r\u00E9gion +isisfish.error.region.load=Impossible de charger la r\u00E9gion isisfish.error.region.name.empty=Le nom de la R\u00E9gion est vide +isisfish.error.region.new= +isisfish.error.region.remove=Impossible de supprimer la r\u00E9gion +isisfish.error.region.removemap=Impossible de supprimer une carte de la r\u00E9gion +isisfish.error.region.save=Impossible de sauver la r\u00E9gion isisfish.error.remove.directory=Can't remove directory %1$s isisfish.error.rename.region=Can't rename region to %1$s isisfish.error.save.checkSum.compilation=Can't save checkSum to compilation\: %1$s -isisfish.error.save.region= isisfish.error.save.script.compilation=Can't save script to compilation\: %1$s isisfish.error.save.simulation.parameters=Can't save simulation parameters in file %1$s isisfish.error.script.create=isisfish.error.script.create @@ -337,13 +362,26 @@ isisfish.error.script.import=N'a pas pu importer pour la raison suivante %1$s isisfish.error.script.load=N'a pas pu charger le fichier %1$s pour la raison suivante %2$s isisfish.error.script.save=N'a pas pu sauver le fichier %1$s pour la raison suivante %2$s -isisfish.error.sensitivity.parameter= +isisfish.error.simulation.addanalyseplan=Impossible d'ajouter un plan d'analyze +isisfish.error.simulation.addrule=Impossible d'ajouter une r\u00E8gle +isisfish.error.simulation.getparametervalue=Impossible d'obtenir la valeur du param\u00E8tre +isisfish.error.simulation.getresultname=Impossible d'obtenir la liste des r\u00E9sultat +isisfish.error.simulation.importparameter=Impossible d'importer les param\u00E8tres de simulation +isisfish.error.simulation.initsimulaction=Impossible d'initialiser la simulation +isisfish.error.simulation.launchsimulation=Impossible de lancer la simulation +isisfish.error.simulation.listoldsimulation=Impossible de lister les anciennes simulations +isisfish.error.simulation.listpopulation=Impossible d'obtenir la liste des populations +isisfish.error.simulation.liststrategies=Impossible d'obtenir la liste des stat\u00E9gies +isisfish.error.simulation.loadoldsimulation=Impossible de charger une ancienne simulation isisfish.error.simulation.log.openAppender=n'a pas pu ouvrir l'appender de la simulation %1$s pour la raison %2$s +isisfish.error.simulation.openregion=Impossible d'ouvrir la r\u00E9gion isisfish.error.simulation.remote.global=Impossible de lancer une simulation sur serveur distant isisfish.error.simulation.remote.wrongportvalue=Le port de connexion a une valeur incorrecte \: %s isisfish.error.simulation.resultXml.close=Can't close simulation result XML for reason %1$s isisfish.error.simulation.resultXml.open=Can't open simulation result XML for reason %1$s isisfish.error.simulation.resultXml.write=Can't write simulation result XML for reason %1$s +isisfish.error.simulation.savesimulation=Impossible de sauver les param\u00E8tres de simulation +isisfish.error.simulation.setparametervalue=Impossible d'affecter la valeur du param\u00E8tre isisfish.error.source.parameter=Can't get parameter from source isisfish.error.strategy.order=Strategy %1$s don't have 12 StrategyMonthInfo but %2$s. Recreate them isisfish.error.undefined.classes=pas de classes d\u00E9finies @@ -580,8 +618,8 @@ isisfish.message.evaluation.finished=\u00E9valuation termin\u00E9e isisfish.message.export.done=Export termin\u00E9 isisfish.message.export.zip=Exporter dans le fichier zip %1$s -isisfish.message.file.already.exists= -isisfish.message.file.overwrite=Le fichier existe, Voulez-vous l'\u00E9craser ? +isisfish.message.file.already.exists=Le fichier %s existe, voulez-vous l'\u00E9craser ? +isisfish.message.file.overwrite=Le fichier existe, voulez-vous l'\u00E9craser ? isisfish.message.import=Importer %1$s isisfish.message.import.equation.convert=Conversion manuelle de l'\u00E9quation isisfish.message.import.finished=Import termin\u00E9 @@ -594,7 +632,7 @@ isisfish.message.import.scripts.zipped=Archive de script (*.zip) isisfish.message.import.xml.v2.file=Import xml v2 file isisfish.message.import.zip=Import zip file -isisfish.message.launchui.notlaunch= +isisfish.message.launchui.notlaunch=Interface utilisateur non lanc\u00E9e isisfish.message.load.finished=Chargement termin\u00E9 isisfish.message.load.map=Chargement de la carte \: %1$s (%2$s, %3$s) isisfish.message.loading.old.simulation=Chargement d'une ancienne simulation ... @@ -644,6 +682,7 @@ isisfish.metierSeasonInfoZone.season=Saison isisfish.metierSeasonInfoZone.selectSeason=S\u00E9lectionnez une saison isisfish.metierSeasonInfoZone.title=Saison / Zones +isisfish.misc.nuitonmigration=IsisFish a d\u00E9tect\u00E9 l'utilisation de librairies CodeLutin dans les scripts suivants.\nVoulez vous migrer ces scripts vers les nouvelles librairies nuiton ? isisfish.monitor.title=Moniteur de l'application isisfish.month.april=avril isisfish.month.august=ao\u00FBt @@ -1073,7 +1112,7 @@ isisfish.welcome.menu.help.isisfish=Site d'Isis-Fish isisfish.welcome.menu.help.isisfishapi=API Isis-Fish isisfish.welcome.menu.help.javaapi=API Java -isisfish.welcome.menu.help.lutinmatrixapi=API LutinMatrix +isisfish.welcome.menu.help.matrixapi=API NuitonMatrix isisfish.welcome.menu.help.topiaapi=API ToPIA isisfish.welcome.menu.input=Saisie isisfish.welcome.menu.monitor=Fen\u00EAtre de logs Added: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/ActiveRuleImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/ActiveRuleImpl.hbm.xml (rev 0) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/ActiveRuleImpl.hbm.xml 2009-10-13 15:00:50 UTC (rev 2658) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.ActiveRuleImpl" table="activeRule" node="fr.ifremer.isisfish.entities.ActiveRuleImpl" abstract="false" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="activeRuleDate" type="fr.ifremer.isisfish.types.hibernate.DateType" access="field" column="activeRuleDate" node="activeRuleDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="param" type="text" access="field" column="param" node="param"/> + </class> +</hibernate-mapping> Added: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/CellImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/CellImpl.hbm.xml (rev 0) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/CellImpl.hbm.xml 2009-10-13 15:00:50 UTC (rev 2658) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.CellImpl" table="cell" node="fr.ifremer.isisfish.entities.CellImpl" abstract="false" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="latitude" type="float" access="field" column="latitude" node="latitude"/> + <property name="longitude" type="float" access="field" column="longitude" node="longitude"/> + <property name="land" type="boolean" access="field" column="land" node="land"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + </class> +</hibernate-mapping> Added: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/EffortDescriptionImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/EffortDescriptionImpl.hbm.xml (rev 0) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/EffortDescriptionImpl.hbm.xml 2009-10-13 15:00:50 UTC (rev 2658) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.EffortDescriptionImpl" table="effortDescription" node="fr.ifremer.isisfish.entities.EffortDescriptionImpl" abstract="false" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="fishingOperation" type="int" access="field" column="fishingOperation" node="fishingOperation"/> + <property name="fishingOperationDuration" type="fr.ifremer.isisfish.types.hibernate.TimeUnitType" access="field" column="fishingOperationDuration" node="fishingOperationDuration"/> + <property name="gearsNumberPerOperation" type="int" access="field" column="gearsNumberPerOperation" node="gearsNumberPerOperation"/> + <property name="crewSize" type="int" access="field" column="crewSize" node="crewSize"/> + <property name="unitCostOfFishing" type="double" access="field" column="unitCostOfFishing" node="unitCostOfFishing"/> + <property name="fixedCrewSalary" type="double" access="field" column="fixedCrewSalary" node="fixedCrewSalary"/> + <property name="crewShareRate" type="double" access="field" column="crewShareRate" node="crewShareRate"/> + <property name="crewFoodCost" type="double" access="field" column="crewFoodCost" node="crewFoodCost"/> + <property name="repairAndMaintenanceGearCost" type="double" access="field" column="repairAndMaintenanceGearCost" node="repairAndMaintenanceGearCost"/> + <property name="otherRunningCost" type="double" access="field" column="otherRunningCost" node="otherRunningCost"/> + <property name="landingCosts" type="double" access="field" column="landingCosts" node="landingCosts"/> + <many-to-one name="setOfVessels" class="fr.ifremer.isisfish.entities.SetOfVesselsImpl" column="setOfVessels" node="setOfVessels/@topiaId" embed-xml="false" /> + <many-to-one name="possibleMetiers" class="fr.ifremer.isisfish.entities.MetierImpl" column="possibleMetiers" node="possibleMetiers/@topiaId" embed-xml="false" /> + </class> +</hibernate-mapping> Added: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/EquationImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/EquationImpl.hbm.xml (rev 0) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/EquationImpl.hbm.xml 2009-10-13 15:00:50 UTC (rev 2658) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.EquationImpl" table="equation" node="fr.ifremer.isisfish.entities.EquationImpl" abstract="false" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="content" type="text" access="field" column="content" node="content"/> + <property name="category" type="text" access="field" column="category" node="category"/> + <property name="language" type="text" access="field" column="language" node="language"/> + <property name="javaInterface" type="java.lang.Class" access="field" column="javaInterface" node="javaInterface"/> + </class> +</hibernate-mapping> Added: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/FisheryRegionImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/FisheryRegionImpl.hbm.xml (rev 0) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/FisheryRegionImpl.hbm.xml 2009-10-13 15:00:50 UTC (rev 2658) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.FisheryRegionImpl" table="fisheryRegion" node="fr.ifremer.isisfish.entities.FisheryRegionImpl" abstract="false" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="minLongitude" type="float" access="field" column="minLongitude" node="minLongitude"/> + <property name="maxLongitude" type="float" access="field" column="maxLongitude" node="maxLongitude"/> + <property name="minLatitude" type="float" access="field" column="minLatitude" node="minLatitude"/> + <property name="maxLatitude" type="float" access="field" column="maxLatitude" node="maxLatitude"/> + <property name="cellLengthLongitude" type="float" access="field" column="cellLengthLongitude" node="cellLengthLongitude"/> + <property name="cellLengthLatitude" type="float" access="field" column="cellLengthLatitude" node="cellLengthLatitude"/> + <property name="mapFiles" type="text" access="field" column="mapFiles" node="mapFiles"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + </class> +</hibernate-mapping> Added: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/GearImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/GearImpl.hbm.xml (rev 0) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/GearImpl.hbm.xml 2009-10-13 15:00:50 UTC (rev 2658) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.GearImpl" table="gear" node="fr.ifremer.isisfish.entities.GearImpl" abstract="false" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="effortUnit" type="text" access="field" column="effortUnit" node="effortUnit"/> + <property name="standardisationFactor" type="double" access="field" column="standardisationFactor" node="standardisationFactor"/> + <property name="parameterName" type="text" access="field" column="parameterName" node="parameterName"/> + <property name="cost" type="double" access="field" column="cost" node="cost"/> + <property name="possibleValue" type="fr.ifremer.isisfish.types.hibernate.RangeOfValuesType" access="field" column="possibleValue" node="possibleValue"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + <bag name="populationSelectivity" lazy="true" cascade="all,delete-orphan" node="populationSelectivity" embed-xml="false"> + <key column="gear"/> + <one-to-many class="fr.ifremer.isisfish.entities.SelectivityImpl" node="topiaId" embed-xml="false"/> + </bag> + </class> +</hibernate-mapping> Added: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/MetierImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/MetierImpl.hbm.xml (rev 0) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/MetierImpl.hbm.xml 2009-10-13 15:00:50 UTC (rev 2658) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.MetierImpl" table="metier" node="fr.ifremer.isisfish.entities.MetierImpl" abstract="false" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="gearParameterValue" type="text" access="field" column="gearParameterValue" node="gearParameterValue"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + <property name="capturableSpeciesComment" type="text" access="field" column="capturableSpeciesComment" node="capturableSpeciesComment"/> + <many-to-one name="gear" class="fr.ifremer.isisfish.entities.GearImpl" column="gear" node="gear/@topiaId" embed-xml="false"/> + <bag name="setOfVesselsEffortDescription" inverse="true" lazy="true" cascade="all,delete-orphan" node="setOfVesselsEffortDescription" embed-xml="false"> + <key column="possibleMetiers"/> + <one-to-many class="fr.ifremer.isisfish.entities.EffortDescriptionImpl" node="topiaId" embed-xml="false"/> + </bag> + <bag name="metierSeasonInfo" inverse="true" lazy="true" cascade="all,delete-orphan" node="metierSeasonInfo" embed-xml="false"> + <key column="metier"/> + <one-to-many class="fr.ifremer.isisfish.entities.MetierSeasonInfoImpl" node="topiaId" embed-xml="false"/> + </bag> + </class> +</hibernate-mapping> Added: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.hbm.xml (rev 0) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.hbm.xml 2009-10-13 15:00:50 UTC (rev 2658) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <union-subclass name="fr.ifremer.isisfish.entities.MetierSeasonInfoImpl" extends="fr.ifremer.isisfish.entities.SeasonImpl" table="metierSeasonInfo" node="fr.ifremer.isisfish.entities.MetierSeasonInfoImpl" abstract="false" > +  + <property name="seasonZoneComment" type="text" access="field" column="seasonZoneComment" node="seasonZoneComment"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + <bag name="speciesTargetSpecies" lazy="true" cascade="all,delete-orphan" node="speciesTargetSpecies" embed-xml="false"> + <key column="metierSeasonInfo"/> + <one-to-many class="fr.ifremer.isisfish.entities.TargetSpeciesImpl" node="topiaId" embed-xml="false"/> + </bag> + <many-to-one name="metier" class="fr.ifremer.isisfish.entities.MetierImpl" column="metier" node="metier/@topiaId" embed-xml="false"/> + <bag name="zone" table="metierseasoninfo_zone" lazy="true" node="zone" embed-xml="true"> + <key column="metierSeasonInfo"/> + <many-to-many class="fr.ifremer.isisfish.entities.ZoneImpl" column="zone" node="topiaId"/> + </bag> + </union-subclass> +</hibernate-mapping> Added: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/PopulationGroupImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/PopulationGroupImpl.hbm.xml (rev 0) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/PopulationGroupImpl.hbm.xml 2009-10-13 15:00:50 UTC (rev 2658) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.PopulationGroupImpl" table="populationGroup" node="fr.ifremer.isisfish.entities.PopulationGroupImpl" abstract="false" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="id" type="int" access="field" column="id" node="id"/> + <property name="reproductionRate" type="double" access="field" column="reproductionRate" node="reproductionRate"/> + <property name="age" type="double" access="field" column="age" node="age"/> + <property name="minLength" type="double" access="field" column="minLength" node="minLength"/> + <property name="maxLength" type="double" access="field" column="maxLength" node="maxLength"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + <many-to-one name="population" class="fr.ifremer.isisfish.entities.PopulationImpl" column="population" node="population/@topiaId" embed-xml="false"/> + </class> +</hibernate-mapping> Added: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml (rev 0) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml 2009-10-13 15:00:50 UTC (rev 2658) @@ -0,0 +1,73 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.PopulationImpl" table="population" node="fr.ifremer.isisfish.entities.PopulationImpl" abstract="false" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="geographicId" type="text" access="field" column="geographicId" node="geographicId"/> + <property name="plusGroup" type="boolean" access="field" column="plusGroup" node="plusGroup"/> + <many-to-one name="growth" class="fr.ifremer.isisfish.entities.EquationImpl" column="growth" cascade="delete" node="growth/@topiaId" embed-xml="false"/> + <many-to-one name="growthReverse" class="fr.ifremer.isisfish.entities.EquationImpl" column="growthReverse" cascade="delete" node="growthReverse/@topiaId" embed-xml="false"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + <many-to-one name="meanWeight" class="fr.ifremer.isisfish.entities.EquationImpl" column="meanWeight" cascade="delete" node="meanWeight/@topiaId" embed-xml="false"/> + <many-to-one name="price" class="fr.ifremer.isisfish.entities.EquationImpl" column="price" cascade="delete" node="price/@topiaId" embed-xml="false"/> + <many-to-one name="naturalDeathRate" class="fr.ifremer.isisfish.entities.EquationImpl" column="naturalDeathRate" cascade="delete" node="naturalDeathRate/@topiaId" embed-xml="false"/> + <property name="caractBioComment" type="text" access="field" column="caractBioComment" node="caractBioComment"/> + <many-to-one name="reproductionEquation" class="fr.ifremer.isisfish.entities.EquationImpl" column="reproductionEquation" cascade="delete" node="reproductionEquation/@topiaId" embed-xml="false"/> + <property name="monthGapBetweenReproRecrutement" type="int" access="field" column="monthGapBetweenReproRecrutement" node="monthGapBetweenReproRecrutement"/> + <property name="recruitmentDistribution" type="fr.ifremer.isisfish.types.hibernate.MatrixType" access="field" > + <column name="recruitmentDistribution_name"/> + <column name="recruitmentDistribution_dim"/> + <column name="recruitmentDistribution_dimNames"/> + <column name="recruitmentDistribution_semantics"/> + <column name="recruitmentDistribution_data"/> + </property> + <property name="recruitmentComment" type="text" access="field" column="recruitmentComment" node="recruitmentComment"/> + <property name="zonesComment" type="text" access="field" column="zonesComment" node="zonesComment"/> + <property name="seasonsComment" type="text" access="field" column="seasonsComment" node="seasonsComment"/> + <property name="capturabilityComment" type="text" access="field" column="capturabilityComment" node="capturabilityComment"/> + <property name="migrationComment" type="text" access="field" column="migrationComment" node="migrationComment"/> + <property name="mappingZoneReproZoneRecru" type="fr.ifremer.isisfish.types.hibernate.MatrixType" access="field" > + <column name="mappingZoneReproZoneRecru_name"/> + <column name="mappingZoneReproZoneRecru_dim"/> + <column name="mappingZoneReproZoneRecru_dimNames"/> + <column name="mappingZoneReproZoneRecru_semantics"/> + <column name="mappingZoneReproZoneRecru_data"/> + </property> + <property name="capturability" type="fr.ifremer.isisfish.types.hibernate.MatrixType" access="field" > + <column name="capturability_name"/> + <column name="capturability_dim"/> + <column name="capturability_dimNames"/> + <column name="capturability_semantics"/> + <column name="capturability_data"/> + </property> + <bag name="gearSelectivity" inverse="true" lazy="true" cascade="all,delete-orphan" node="gearSelectivity" embed-xml="false"> + <key column="population"/> + <one-to-many class="fr.ifremer.isisfish.entities.SelectivityImpl" node="topiaId" embed-xml="false"/> + </bag> + <bag name="populationGroup" lazy="true" cascade="all,delete-orphan" node="populationGroup" embed-xml="false"> + <key column="population"/> + <one-to-many class="fr.ifremer.isisfish.entities.PopulationGroupImpl" node="topiaId" embed-xml="false"/> + </bag> + <bag name="populationSeasonInfo" inverse="true" lazy="true" cascade="all,delete-orphan" node="populationSeasonInfo" embed-xml="false"> + <key column="population"/> + <one-to-many class="fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl" node="topiaId" embed-xml="false"/> + </bag> + <many-to-one name="species" class="fr.ifremer.isisfish.entities.SpeciesImpl" column="species" node="species/@topiaId" embed-xml="false"/> + <bag name="reproductionZone" table="population_reproductionzone" lazy="true" node="reproductionZone" embed-xml="true"> + <key column="population"/> + <many-to-many class="fr.ifremer.isisfish.entities.ZoneImpl" column="reproductionZone" node="topiaId"/> + </bag> + <bag name="populationZone" table="population_populationzone" lazy="true" node="populationZone" embed-xml="true"> + <key column="population"/> + <many-to-many class="fr.ifremer.isisfish.entities.ZoneImpl" column="populationZone" node="topiaId"/> + </bag> + <bag name="recruitmentZone" table="population_recruitmentzone" lazy="true" node="recruitmentZone" embed-xml="true"> + <key column="population"/> + <many-to-many class="fr.ifremer.isisfish.entities.ZoneImpl" column="recruitmentZone" node="topiaId"/> + </bag> + <many-to-one name="maturityGroup" class="fr.ifremer.isisfish.entities.PopulationGroupImpl" column="maturityGroup" node="maturityGroup/@topiaId" embed-xml="false"/> + </class> +</hibernate-mapping> Added: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.hbm.xml (rev 0) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.hbm.xml 2009-10-13 15:00:50 UTC (rev 2658) @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <union-subclass name="fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl" extends="fr.ifremer.isisfish.entities.SeasonImpl" table="populationSeasonInfo" node="fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl" abstract="false" > +  + <property name="reproductionDistribution" type="fr.ifremer.isisfish.types.hibernate.MatrixType" access="field" > + <column name="reproductionDistribution_name"/> + <column name="reproductionDistribution_dim"/> + <column name="reproductionDistribution_dimNames"/> + <column name="reproductionDistribution_semantics"/> + <column name="reproductionDistribution_data"/> + </property> + <property name="groupChange" type="boolean" access="field" column="groupChange" node="groupChange"/> + <property name="simpleLengthChangeMatrix" type="boolean" access="field" column="simpleLengthChangeMatrix" node="simpleLengthChangeMatrix"/> + <property name="lengthChangeMatrix" type="fr.ifremer.isisfish.types.hibernate.MatrixType" access="field" > + <column name="lengthChangeMatrix_name"/> + <column name="lengthChangeMatrix_dim"/> + <column name="lengthChangeMatrix_dimNames"/> + <column name="lengthChangeMatrix_semantics"/> + <column name="lengthChangeMatrix_data"/> + </property> + <property name="reproduction" type="boolean" access="field" column="reproduction" node="reproduction"/> + <property name="useEquationMigration" type="boolean" access="field" column="useEquationMigration" node="useEquationMigration"/> + <property name="migrationMatrix" type="fr.ifremer.isisfish.types.hibernate.MatrixType" access="field" > + <column name="migrationMatrix_name"/> + <column name="migrationMatrix_dim"/> + <column name="migrationMatrix_dimNames"/> + <column name="migrationMatrix_semantics"/> + <column name="migrationMatrix_data"/> + </property> + <property name="emigrationMatrix" type="fr.ifremer.isisfish.types.hibernate.MatrixType" access="field" > + <column name="emigrationMatrix_name"/> + <column name="emigrationMatrix_dim"/> + <column name="emigrationMatrix_dimNames"/> + <column name="emigrationMatrix_semantics"/> + <column name="emigrationMatrix_data"/> + </property> + <property name="immigrationMatrix" type="fr.ifremer.isisfish.types.hibernate.MatrixType" access="field" > + <column name="immigrationMatrix_name"/> + <column name="immigrationMatrix_dim"/> + <column name="immigrationMatrix_dimNames"/> + <column name="immigrationMatrix_semantics"/> + <column name="immigrationMatrix_data"/> + </property> + <many-to-one name="migrationEquation" class="fr.ifremer.isisfish.entities.EquationImpl" column="migrationEquation" cascade="delete" node="migrationEquation/@topiaId" embed-xml="false"/> + <many-to-one name="emigrationEquation" class="fr.ifremer.isisfish.entities.EquationImpl" column="emigrationEquation" cascade="delete" node="emigrationEquation/@topiaId" embed-xml="false"/> + <many-to-one name="immigrationEquation" class="fr.ifremer.isisfish.entities.EquationImpl" column="immigrationEquation" cascade="delete" node="immigrationEquation/@topiaId" embed-xml="false"/> + <many-to-one name="population" class="fr.ifremer.isisfish.entities.PopulationImpl" column="population" node="population/@topiaId" embed-xml="false"/> + </union-subclass> +</hibernate-mapping> Added: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/PortImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/PortImpl.hbm.xml (rev 0) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/PortImpl.hbm.xml 2009-10-13 15:00:50 UTC (rev 2658) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.PortImpl" table="port" node="fr.ifremer.isisfish.entities.PortImpl" abstract="false" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + <many-to-one name="cell" class="fr.ifremer.isisfish.entities.CellImpl" column="cell" node="cell/@topiaId" embed-xml="false"/> + </class> +</hibernate-mapping> Added: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/ResultImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/ResultImpl.hbm.xml (rev 0) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/ResultImpl.hbm.xml 2009-10-13 15:00:50 UTC (rev 2658) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.ResultImpl" table="result" node="fr.ifremer.isisfish.entities.ResultImpl" abstract="false" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="resultDate" type="fr.ifremer.isisfish.types.hibernate.DateType" access="field" column="resultDate" node="resultDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="matrix" type="fr.ifremer.isisfish.types.hibernate.MatrixType" access="field" > + <column name="matrix_name"/> + <column name="matrix_dim"/> + <column name="matrix_dimNames"/> + <column name="matrix_semantics"/> + <column name="matrix_data"/> + </property> + </class> +</hibernate-mapping> Added: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/SeasonImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/SeasonImpl.hbm.xml (rev 0) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/SeasonImpl.hbm.xml 2009-10-13 15:00:50 UTC (rev 2658) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.SeasonImpl" table="season" node="fr.ifremer.isisfish.entities.SeasonImpl" abstract="false" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="firstMonth" type="fr.ifremer.isisfish.types.hibernate.MonthType" access="field" column="firstMonth" node="firstMonth"/> + <property name="lastMonth" type="fr.ifremer.isisfish.types.hibernate.MonthType" access="field" column="lastMonth" node="lastMonth"/> + </class> +</hibernate-mapping> Added: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/SelectivityImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/SelectivityImpl.hbm.xml (rev 0) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/SelectivityImpl.hbm.xml 2009-10-13 15:00:50 UTC (rev 2658) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.SelectivityImpl" table="selectivity" node="fr.ifremer.isisfish.entities.SelectivityImpl" abstract="false" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <many-to-one name="equation" class="fr.ifremer.isisfish.entities.EquationImpl" column="equation" cascade="delete" node="equation/@topiaId" embed-xml="false"/> + <many-to-one name="gear" class="fr.ifremer.isisfish.entities.GearImpl" column="gear" node="gear/@topiaId" embed-xml="false" /> + <many-to-one name="population" class="fr.ifremer.isisfish.entities.PopulationImpl" column="population" node="population/@topiaId" embed-xml="false" /> + </class> +</hibernate-mapping> Added: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/SetOfVesselsImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/SetOfVesselsImpl.hbm.xml (rev 0) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/SetOfVesselsImpl.hbm.xml 2009-10-13 15:00:50 UTC (rev 2658) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.SetOfVesselsImpl" table="setOfVessels" node="fr.ifremer.isisfish.entities.SetOfVesselsImpl" abstract="false" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="numberOfVessels" type="int" access="field" column="numberOfVessels" node="numberOfVessels"/> + <property name="fixedCosts" type="double" access="field" column="fixedCosts" node="fixedCosts"/> + <property name="vesselCosts" type="double" access="field" column="vesselCosts" node="vesselCosts"/> + <property name="capitalDeprecation" type="double" access="field" column="capitalDeprecation" node="capitalDeprecation"/> + <property name="interestCost" type="double" access="field" column="interestCost" node="interestCost"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + <many-to-one name="technicalEfficiencyEquation" class="fr.ifremer.isisfish.entities.EquationImpl" column="technicalEfficiencyEquation" cascade="delete" node="technicalEfficiencyEquation/@topiaId" embed-xml="false"/> + <many-to-one name="port" class="fr.ifremer.isisfish.entities.PortImpl" column="port" node="port/@topiaId" embed-xml="false"/> + <bag name="possibleMetiers" lazy="true" cascade="all,delete-orphan" node="possibleMetiers" embed-xml="false"> + <key column="setOfVessels"/> + <one-to-many class="fr.ifremer.isisfish.entities.EffortDescriptionImpl" node="topiaId" embed-xml="false"/> + </bag> + <many-to-one name="vesselType" class="fr.ifremer.isisfish.entities.VesselTypeImpl" column="vesselType" node="vesselType/@topiaId" embed-xml="false"/> + </class> +</hibernate-mapping> Added: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/SpeciesImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/SpeciesImpl.hbm.xml (rev 0) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/SpeciesImpl.hbm.xml 2009-10-13 15:00:50 UTC (rev 2658) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.SpeciesImpl" table="species" node="fr.ifremer.isisfish.entities.SpeciesImpl" abstract="false" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="scientificName" type="text" access="field" column="scientificName" node="scientificName"/> + <property name="codeRubbin" type="text" access="field" column="codeRubbin" node="codeRubbin"/> + <property name="codeCEE" type="int" access="field" column="codeCEE" node="codeCEE"/> + <property name="ageGroupType" type="boolean" access="field" column="ageGroupType" node="ageGroupType"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + <bag name="metierSeasonInfoTargetSpecies" inverse="true" lazy="true" cascade="all,delete-orphan" node="metierSeasonInfoTargetSpecies" embed-xml="false"> + <key column="species"/> + <one-to-many class="fr.ifremer.isisfish.entities.TargetSpeciesImpl" node="topiaId" embed-xml="false"/> + </bag> + <bag name="population" inverse="true" lazy="true" cascade="all,delete-orphan" node="population" embed-xml="false"> + <key column="species"/> + <one-to-many class="fr.ifremer.isisfish.entities.PopulationImpl" node="topiaId" embed-xml="false"/> + </bag> + </class> +</hibernate-mapping> Added: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/StrategyImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/StrategyImpl.hbm.xml (rev 0) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/StrategyImpl.hbm.xml 2009-10-13 15:00:50 UTC (rev 2658) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.StrategyImpl" table="strategy" node="fr.ifremer.isisfish.entities.StrategyImpl" abstract="false" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="proportionSetOfVessels" type="double" access="field" column="proportionSetOfVessels" node="proportionSetOfVessels"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + <property name="inactivityEquationUsed" type="boolean" access="field" column="inactivityEquationUsed" node="inactivityEquationUsed"/> + <many-to-one name="inactivityEquation" class="fr.ifremer.isisfish.entities.EquationImpl" column="inactivityEquation" cascade="delete" node="inactivityEquation/@topiaId" embed-xml="false"/> + <many-to-one name="setOfVessels" class="fr.ifremer.isisfish.entities.SetOfVesselsImpl" column="setOfVessels" node="setOfVessels/@topiaId" embed-xml="false"/> + <bag name="strategyMonthInfo" inverse="true" lazy="true" cascade="all,delete-orphan" node="strategyMonthInfo" embed-xml="false"> + <key column="strategy"/> + <one-to-many class="fr.ifremer.isisfish.entities.StrategyMonthInfoImpl" node="topiaId" embed-xml="false"/> + </bag> + </class> +</hibernate-mapping> Added: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.hbm.xml (rev 0) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.hbm.xml 2009-10-13 15:00:50 UTC (rev 2658) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.StrategyMonthInfoImpl" table="strategyMonthInfo" node="fr.ifremer.isisfish.entities.StrategyMonthInfoImpl" abstract="false" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="month" type="fr.ifremer.isisfish.types.hibernate.MonthType" access="field" column="month" node="month"/> + <property name="minInactivityDays" type="double" access="field" column="minInactivityDays" node="minInactivityDays"/> + <property name="numberOfTrips" type="double" access="field" column="numberOfTrips" node="numberOfTrips"/> + <property name="proportionMetier" type="fr.ifremer.isisfish.types.hibernate.MatrixType" access="field" > + <column name="proportionMetier_name"/> + <column name="proportionMetier_dim"/> + <column name="proportionMetier_dimNames"/> + <column name="proportionMetier_semantics"/> + <column name="proportionMetier_data"/> + </property> + <many-to-one name="tripType" class="fr.ifremer.isisfish.entities.TripTypeImpl" column="tripType" node="tripType/@topiaId" embed-xml="false"/> + <many-to-one name="strategy" class="fr.ifremer.isisfish.entities.StrategyImpl" column="strategy" node="strategy/@topiaId" embed-xml="false"/> + </class> +</hibernate-mapping> Added: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/TargetSpeciesImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/TargetSpeciesImpl.hbm.xml (rev 0) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/TargetSpeciesImpl.hbm.xml 2009-10-13 15:00:50 UTC (rev 2658) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.TargetSpeciesImpl" table="targetSpecies" node="fr.ifremer.isisfish.entities.TargetSpeciesImpl" abstract="false" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <many-to-one name="targetFactorEquation" class="fr.ifremer.isisfish.entities.EquationImpl" column="targetFactorEquation" cascade="delete" node="targetFactorEquation/@topiaId" embed-xml="false"/> + <property name="primaryCatch" type="boolean" access="field" column="primaryCatch" node="primaryCatch"/> + <many-to-one name="species" class="fr.ifremer.isisfish.entities.SpeciesImpl" column="species" node="species/@topiaId" embed-xml="false" /> + <many-to-one name="metierSeasonInfo" class="fr.ifremer.isisfish.entities.MetierSeasonInfoImpl" column="metierSeasonInfo" node="metierSeasonInfo/@topiaId" embed-xml="false" /> + </class> +</hibernate-mapping> Added: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/TripTypeImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/TripTypeImpl.hbm.xml (rev 0) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/TripTypeImpl.hbm.xml 2009-10-13 15:00:50 UTC (rev 2658) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.TripTypeImpl" table="tripType" node="fr.ifremer.isisfish.entities.TripTypeImpl" abstract="false" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="tripDuration" type="fr.ifremer.isisfish.types.hibernate.TimeUnitType" access="field" column="tripDuration" node="tripDuration"/> + <property name="minTimeBetweenTrip" type="fr.ifremer.isisfish.types.hibernate.TimeUnitType" access="field" column="minTimeBetweenTrip" node="minTimeBetweenTrip"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + </class> +</hibernate-mapping> Added: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/VesselTypeImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/VesselTypeImpl.hbm.xml (rev 0) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/VesselTypeImpl.hbm.xml 2009-10-13 15:00:50 UTC (rev 2658) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.VesselTypeImpl" table="vesselType" node="fr.ifremer.isisfish.entities.VesselTypeImpl" abstract="false" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="length" type="int" access="field" column="length" node="length"/> + <property name="speed" type="double" access="field" column="speed" node="speed"/> + <property name="maxTripDuration" type="fr.ifremer.isisfish.types.hibernate.TimeUnitType" access="field" column="maxTripDuration" node="maxTripDuration"/> + <property name="activityRange" type="double" access="field" column="activityRange" node="activityRange"/> + <property name="minCrewSize" type="int" access="field" column="minCrewSize" node="minCrewSize"/> + <property name="unitFuelCostOfTravel" type="double" access="field" column="unitFuelCostOfTravel" node="unitFuelCostOfTravel"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + <bag name="tripType" table="triptype_vesseltype" lazy="true" node="tripType" embed-xml="true"> + <key column="vesselType"/> + <many-to-many class="fr.ifremer.isisfish.entities.TripTypeImpl" column="tripType" node="topiaId"/> + </bag> + </class> +</hibernate-mapping> Added: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/ZoneImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/ZoneImpl.hbm.xml (rev 0) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.3/fr/ifremer/isisfish/entities/ZoneImpl.hbm.xml 2009-10-13 15:00:50 UTC (rev 2658) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.ZoneImpl" table="zone" node="fr.ifremer.isisfish.entities.ZoneImpl" abstract="false" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + <bag name="cell" table="cell_zone" lazy="true" node="cell" embed-xml="true"> + <key column="zone"/> + <many-to-many class="fr.ifremer.isisfish.entities.CellImpl" column="cell" node="topiaId"/> + </bag> + </class> +</hibernate-mapping> Modified: isis-fish/trunk/src/main/resources/templates/script/analyseplan.ftl =================================================================== --- isis-fish/trunk/src/main/resources/templates/script/analyseplan.ftl 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/resources/templates/script/analyseplan.ftl 2009-10-13 15:00:50 UTC (rev 2658) @@ -18,7 +18,7 @@ package analyseplans; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -26,9 +26,9 @@ import scripts.ResultName; import java.io.Writer; -import org.codelutin.math.matrix.*; -import org.codelutin.util.*; -import org.codelutin.topia.*; +import org.nuiton.math.matrix.*; +import org.nuiton.util.*; +import org.nuiton.topia.*; import fr.ifremer.isisfish.util.Doc; import fr.ifremer.isisfish.*; Modified: isis-fish/trunk/src/main/resources/templates/script/export.ftl =================================================================== --- isis-fish/trunk/src/main/resources/templates/script/export.ftl 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/resources/templates/script/export.ftl 2009-10-13 15:00:50 UTC (rev 2658) @@ -23,8 +23,8 @@ import java.io.Writer; -import static org.codelutin.i18n.I18n._; -import org.codelutin.math.matrix.*; +import static org.nuiton.i18n.I18n._; +import org.nuiton.math.matrix.*; import scripts.ResultName; Modified: isis-fish/trunk/src/main/resources/templates/script/rule.ftl =================================================================== --- isis-fish/trunk/src/main/resources/templates/script/rule.ftl 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/resources/templates/script/rule.ftl 2009-10-13 15:00:50 UTC (rev 2658) @@ -18,7 +18,7 @@ package rules; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -27,7 +27,7 @@ import java.io.Writer; -import org.codelutin.math.matrix.*; +import org.nuiton.math.matrix.*; import fr.ifremer.isisfish.util.Doc; import fr.ifremer.isisfish.simulator.SimulationContext; Modified: isis-fish/trunk/src/main/resources/templates/script/script.ftl =================================================================== --- isis-fish/trunk/src/main/resources/templates/script/script.ftl 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/resources/templates/script/script.ftl 2009-10-13 15:00:50 UTC (rev 2658) @@ -23,7 +23,7 @@ import fr.ifremer.isisfish.util.Doc; import fr.ifremer.isisfish.entities.*; -import org.codelutin.math.matrix.*; +import org.nuiton.math.matrix.*; /** * ${name}.java Modified: isis-fish/trunk/src/main/resources/templates/script/sensitivity.ftl =================================================================== --- isis-fish/trunk/src/main/resources/templates/script/sensitivity.ftl 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/resources/templates/script/sensitivity.ftl 2009-10-13 15:00:50 UTC (rev 2658) @@ -18,14 +18,14 @@ package sensitivity; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.*; +import org.nuiton.math.matrix.*; import java.io.File; Modified: isis-fish/trunk/src/main/resources/templates/script/sensitivityexport.ftl =================================================================== --- isis-fish/trunk/src/main/resources/templates/script/sensitivityexport.ftl 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/resources/templates/script/sensitivityexport.ftl 2009-10-13 15:00:50 UTC (rev 2658) @@ -23,8 +23,8 @@ import java.io.Writer; -import static org.codelutin.i18n.I18n._; -import org.codelutin.math.matrix.*; +import static org.nuiton.i18n.I18n._; +import org.nuiton.math.matrix.*; import scripts.ResultName; Modified: isis-fish/trunk/src/main/resources/templates/script/simulator.ftl =================================================================== --- isis-fish/trunk/src/main/resources/templates/script/simulator.ftl 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/resources/templates/script/simulator.ftl 2009-10-13 15:00:50 UTC (rev 2658) @@ -21,7 +21,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.*; +import org.nuiton.math.matrix.*; import fr.ifremer.isisfish.util.Doc; import fr.ifremer.isisfish.entities.*; Modified: isis-fish/trunk/src/main/xmi/isis-fish.properties =================================================================== --- isis-fish/trunk/src/main/xmi/isis-fish.properties 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/main/xmi/isis-fish.properties 2009-10-13 15:00:50 UTC (rev 2658) @@ -1,5 +1,5 @@ model.tagvalue.copyright=/* Copyright (C) 1999 - 2009 Ifremer - Code Lutin */ -model.tagvalue.org.codelutin.math.matrix.MatrixND=fr.ifremer.isisfish.types.hibernate.MatrixType(name,dim,dimNames,semantics,data) +model.tagvalue.org.nuiton.math.matrix.MatrixND=fr.ifremer.isisfish.types.hibernate.MatrixType(name,dim,dimNames,semantics,data) model.tagvalue.fr.ifremer.isisfish.types.Month=fr.ifremer.isisfish.types.hibernate.MonthType model.tagvalue.fr.ifremer.isisfish.types.Date=fr.ifremer.isisfish.types.hibernate.DateType model.tagvalue.fr.ifremer.isisfish.types.TimeUnit=fr.ifremer.isisfish.types.hibernate.TimeUnitType Modified: isis-fish/trunk/src/main/xmi/isis-fish.zargo =================================================================== (Binary files differ) Modified: isis-fish/trunk/src/site/site_en.xml =================================================================== --- isis-fish/trunk/src/site/site_en.xml 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/site/site_en.xml 2009-10-13 15:00:50 UTC (rev 2658) @@ -2,9 +2,9 @@ <project name="Isis-fish"> <skin> - <groupId>org.codelutin</groupId> - <artifactId>maven-lutin-skin</artifactId> - <version>0.2.3</version> + <groupId>org.nuiton</groupId> + <artifactId>maven-nuiton-skin</artifactId> + <version>1.0.0</version> </skin> <bannerLeft> Modified: isis-fish/trunk/src/site/site_fr.xml =================================================================== --- isis-fish/trunk/src/site/site_fr.xml 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/site/site_fr.xml 2009-10-13 15:00:50 UTC (rev 2658) @@ -4,9 +4,9 @@ <publishDate format="dd/MM/yyyy"/> <skin> - <groupId>org.codelutin</groupId> - <artifactId>maven-lutin-skin</artifactId> - <version>0.2.3</version> + <groupId>org.nuiton</groupId> + <artifactId>maven-nuiton-skin</artifactId> + <version>1.0.0</version> </skin> <bannerLeft> Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -22,10 +22,11 @@ import java.io.FileFilter; import org.apache.commons.io.FileUtils; -import org.codelutin.util.FileUtil; +import org.nuiton.util.FileUtil; import org.junit.AfterClass; import org.junit.BeforeClass; +import fr.ifremer.isisfish.datastore.TestIsisH2Config; import fr.ifremer.isisfish.util.ClasspathTemplateLoader; import freemarker.cache.TemplateLoader; import freemarker.ext.beans.BeansWrapper; @@ -88,6 +89,10 @@ IsisFish.init(); IsisFish.initVCS(); + // install a new topia migration service callback + // to not ask for user for migration during test + TestIsisH2Config.setTestMigrationCallBack(); + FileUtils.copyDirectory(new File("src/test/resources/test-database"), dirDatabase, new FileFilter() { @Override @@ -100,6 +105,8 @@ return result; } }); + + IsisFish.doNuitonMigration(); } /** Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/ScriptStorageTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/ScriptStorageTest.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/ScriptStorageTest.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -25,7 +25,7 @@ import java.util.HashMap; import java.util.Map; -import org.codelutin.util.FileUtil; +import org.nuiton.util.FileUtil; import org.junit.Assert; import org.junit.Before; import org.junit.Test; Added: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/TestIsisH2Config.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/TestIsisH2Config.java (rev 0) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/TestIsisH2Config.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -0,0 +1,43 @@ +/* *##% + * 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.datastore; + +import org.junit.Ignore; + +import fr.ifremer.isisfish.datastore.migration.TestMigrationCallbackHandler; + +/** + * Empty class used to access inherited static field. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ + at Ignore +public class TestIsisH2Config extends IsisH2Config { + + /** + * Override default migration with test one. + */ + public static void setTestMigrationCallBack() { + databaseMigrationClass = TestMigrationCallbackHandler.class; + } +} Property changes on: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/TestIsisH2Config.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Added: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/migration/TestMigrationCallbackHandler.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/migration/TestMigrationCallbackHandler.java (rev 0) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/migration/TestMigrationCallbackHandler.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -0,0 +1,48 @@ +/* *##% + * Copyright (C) 2007 - 2009 Ifremer, 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.datastore.migration; + +import org.junit.Ignore; +import org.nuiton.topia.migration.DatabaseManager; + +/** + * Test migration callback for topia migration service. + * But for test purpose, don't ask user, always do migration. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author: chatellier $ + */ + at Ignore +public class TestMigrationCallbackHandler extends SwingMigrationCallbackHandler { + + /* + * @see org.nuiton.topia.migration.callback.MigrationCallbackHandler#doMigration(java.lang.String, java.lang.String) + */ + @Override + public MigrationChoice doMigration(DatabaseManager dbManager, + String dbVersion, String applicationVersion) { + + // test always perform migration without ask user + MigrationChoice result = migrate(dbManager, dbVersion, applicationVersion); + return result; + } +} Property changes on: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/migration/TestMigrationCallbackHandler.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/entity/PersistenceTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/entity/PersistenceTest.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/entity/PersistenceTest.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -22,7 +22,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.TopiaContext; +import org.nuiton.topia.TopiaContext; import org.junit.After; import org.junit.Before; import org.junit.Test; Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/entity/PopulationSeasonInfoTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/entity/PopulationSeasonInfoTest.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/entity/PopulationSeasonInfoTest.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -19,7 +19,7 @@ package fr.ifremer.isisfish.entity; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.awt.HeadlessException; import java.util.ArrayList; @@ -33,10 +33,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixFactory; -import org.codelutin.math.matrix.MatrixIterator; -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.math.matrix.gui.MatrixPanelEditor; +import org.nuiton.math.matrix.MatrixFactory; +import org.nuiton.math.matrix.MatrixIterator; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.math.matrix.gui.MatrixPanelEditor; import org.junit.Test; import fr.ifremer.isisfish.AbstractIsisFishTest; Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/logging/LoggerHelper.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/logging/LoggerHelper.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/logging/LoggerHelper.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -26,7 +26,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.util.StringUtil; +import org.nuiton.util.StringUtil; /** * Usefull methods for tests. Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -28,7 +28,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.log4j.Level; import org.apache.log4j.Logger; -import org.codelutin.util.FileUtil; +import org.nuiton.util.FileUtil; import org.junit.Test; import fr.ifremer.isisfish.AbstractIsisFishTest; Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/logging/io/LineReaderTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/logging/io/LineReaderTest.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/logging/io/LineReaderTest.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -24,7 +24,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.util.StringUtil; +import org.nuiton.util.StringUtil; import org.junit.Assert; import org.junit.Before; import org.junit.Test; Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -25,10 +25,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixFactory; -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.topia.TopiaContext; -import org.codelutin.util.FileUtil; +import org.nuiton.math.matrix.MatrixFactory; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.topia.TopiaContext; +import org.nuiton.util.FileUtil; import org.junit.Test; import fr.ifremer.isisfish.AbstractIsisFishTest; Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationHelperTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationHelperTest.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationHelperTest.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -24,9 +24,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.DoubleBigVector; -import org.codelutin.math.matrix.MatrixFactory; -import org.codelutin.topia.TopiaContext; +import org.nuiton.math.matrix.DoubleBigVector; +import org.nuiton.math.matrix.MatrixFactory; +import org.nuiton.topia.TopiaContext; import org.junit.Assert; import org.junit.Test; Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationParameterTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationParameterTest.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationParameterTest.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -25,7 +25,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.util.SortedProperties; +import org.nuiton.util.SortedProperties; import org.junit.Assert; import org.junit.Test; Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -34,11 +34,11 @@ import org.apache.commons.beanutils.ConvertUtilsBean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixFactory; -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.math.matrix.MatrixNDImpl; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.TopiaException; +import org.nuiton.math.matrix.MatrixFactory; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.math.matrix.MatrixNDImpl; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -233,7 +233,7 @@ DiscreteDomain<MatrixND,String> domain1 = new DiscreteDomain<MatrixND,String>(); domain1.getValues().put("m1", matrix1); factor1.setDomain(domain1); - factor1.setPath("org.codelutin.math.matrix.MatrixND#563456293453#2.456347646#dim"); + factor1.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); factor1.setValueForIdentifier("m1"); // factor @@ -241,7 +241,7 @@ DiscreteDomain<MatrixND,String> domain2 = new DiscreteDomain<MatrixND,String>(); domain2.getValues().put("m2", matrix1); factor2.setDomain(domain2); - factor2.setPath("org.codelutin.math.matrix.MatrixND#563456293453#2.456347646#dim"); + factor2.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); factor2.setValueForIdentifier("m2"); // scenario @@ -300,7 +300,7 @@ domain1.setCoefficient(0.1); domain1.setVariableName("PopulationEquation.K1"); factorEquation.setDomain(domain1); - factorEquation.setPath("org.codelutin.equation1#testFactorPreScriptEquation"); + factorEquation.setPath("org.nuiton.equation1#testFactorPreScriptEquation"); factorEquation.setValueForIdentifier(0.1); log.info("Script = " + domain1.getClass().getSimpleName()); @@ -340,7 +340,7 @@ */ @Test public void testMatrixFactorBeanUtils() throws IllegalAccessException, InvocationTargetException { - String factorAsString = "[isisfish.population.capturability,[10, 3],[\"isisfish.population.group\", \"isisfish.population.season\"],[[org.codelutin.topia.persistence.TopiaEntity(fr.ifremer.isisfish.entities.PopulationGroup#1223471369174#0.28237914052272917), org.codelutin.topia.persistence.TopiaEntity(fr.ifremer.isisfish.entities.PopulationGroup#1223471369077#0.6322222161721446), org.codelutin.topia.persistence.TopiaEntity(fr.ifremer.isisfish.entities.PopulationGroup#1223471369117#0.9144815378932778), org.codelutin.topia.persistence.TopiaEntity(fr.ifremer.isisfish.entities.PopulationGroup#1223471369145#0.40303037362612626), org.codelutin.topia.persistence.TopiaEntity(fr.ifremer.isisfish.entities.PopulationGroup#1223471369157#0.7385235788350787), org.codelutin.topia.persistence.TopiaEntity(fr.ifremer.isisfish.entities.PopulationGroup#1223471369129#0.7322508787399089), org.codelutin.topia.persistence.TopiaEntity(fr.ifremer.isisfish.entities.PopulationGroup#1223471369123#0.9794507456491978), org.codelutin.topia.persistence.TopiaEntity(fr.ifremer.isisfish.entities.PopulationGroup#1223471369109#0.6142040515900707), org.codelutin.topia.persistence.TopiaEntity(fr.ifremer.isisfish.entities.PopulationGroup#1223471369163#0.4236915489033358), org.codelutin.topia.persistence.TopiaEntity(fr.ifremer.isisfish.entities.PopulationGroup#1223471369151#0.9128085136422524)], [org.codelutin.topia.persistence.TopiaEntity(fr.ifremer.isisfish.entities.PopulationSeasonInfo#1223471369187#0.14365248282751242), java.lang.String(org.codelutin.topia.persistence.TopiaEntity(fr.ifremer.isisfish.entities.PopulationSeasonInfo#1223471369341#0.8526969683760768)), java.lang.String(org.codelutin.topia.persistence.TopiaEntity(fr.ifremer.isisfish.entities.PopulationSeasonInfo#1223471369569#0.18989201268161482))]],[[0.0, 0.0, 0.0], [2.2001803893501406E-4, 1.7501434915285209E-4, 1.0300844550139294E-4], [6.600541168050422E-4, 0.0023401918686724223, 0.0011700959343362112], [4.040331260442985E-4, 0.002400196788381971, 0.0014301172530775913], [2.2401836691565065E-4, 0.002060168910027859, 7.160587085339548E-4], [9.530781413866745E-5, 0.0017101402117221545, 4.380359138797098E-4], [6.710550187517929E-5, 0.0011800967542878026, 2.830232046300408E-4], [3.530289442911816E-5, 7.840642842047773E-4, 1.6901385718189713E-4], [2.030166450173084E-5, 6.250512469744717E-4, 1.1600951143846195E-4], [1.0200836350623379E-5, 4.0103288005882107E-4, 8.360685479530534E-5]]]"; + String factorAsString = "[isisfish.population.capturability,[10, 3],[\"isisfish.population.group\", \"isisfish.population.season\"],[[org.nuiton.topia.persistence.TopiaEntity(fr.ifremer.isisfish.entities.PopulationGroup#1223471369174#0.28237914052272917), org.nuiton.topia.persistence.TopiaEntity(fr.ifremer.isisfish.entities.PopulationGroup#1223471369077#0.6322222161721446), org.nuiton.topia.persistence.TopiaEntity(fr.ifremer.isisfish.entities.PopulationGroup#1223471369117#0.9144815378932778), org.nuiton.topia.persistence.TopiaEntity(fr.ifremer.isisfish.entities.PopulationGroup#1223471369145#0.40303037362612626), org.nuiton.topia.persistence.TopiaEntity(fr.ifremer.isisfish.entities.PopulationGroup#1223471369157#0.7385235788350787), org.nuiton.topia.persistence.TopiaEntity(fr.ifremer.isisfish.entities.PopulationGroup#1223471369129#0.7322508787399089), org.nuiton.topia.persistence.TopiaEntity(fr.ifremer.isisfish.entities.PopulationGroup#1223471369123#0.9794507456491978), org.nuiton.topia.persistence.TopiaEntity(fr.ifremer.isisfish.entities.PopulationGroup#1223471369109#0.6142040515900707), org.nuiton.topia.persistence.TopiaEntity(fr.ifremer.isisfish.entities.PopulationGroup#1223471369163#0.4236915489033358), org.nuiton.topia.persistence.TopiaEntity(fr.ifremer.isisfish.entities.PopulationGroup#1223471369151#0.9128085136422524)], [org.nuiton.topia.persistence.TopiaEntity(fr.ifremer.isisfish.entities.PopulationSeasonInfo#1223471369187#0.14365248282751242), java.lang.String(org.nuiton.topia.persistence.TopiaEntity(fr.ifremer.isisfish.entities.PopulationSeasonInfo#1223471369341#0.8526969683760768)), java.lang.String(org.nuiton.topia.persistence.TopiaEntity(fr.ifremer.isisfish.entities.PopulationSeasonInfo#1223471369569#0.18989201268161482))]],[[0.0, 0.0, 0.0], [2.2001803893501406E-4, 1.7501434915285209E-4, 1.0300844550139294E-4], [6.600541168050422E-4, 0.0023401918686724223, 0.0011700959343362112], [4.040331260442985E-4, 0.002400196788381971, 0.0014301172530775913], [2.2401836691565065E-4, 0.002060168910027859, 7.160587085339548E-4], [9.530781413866745E-5, 0.0017101402117221545, 4.380359138797098E-4], [6.710550187517929E-5, 0.0011800967542878026, 2.830232046300408E-4], [3.530289442911816E-5, 7.840642842047773E-4, 1.6901385718189713E-4], [2.030166450173084E-5, 6.250512469744717E-4, 1.1600951143846195E-4], [1.0200836350623379E-5, 4.0103288005882107E-4, 8.360685479530534E-5]]]"; Population p = new PopulationImpl(); p.setCapturability(MatrixFactory.getInstance().create("ee" , new List[]{ Collections.singletonList("eee")})); Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -23,8 +23,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixFactory; -import org.codelutin.math.matrix.MatrixND; +import org.nuiton.math.matrix.MatrixFactory; +import org.nuiton.math.matrix.MatrixND; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -20,8 +20,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixFactory; -import org.codelutin.math.matrix.MatrixND; +import org.nuiton.math.matrix.MatrixFactory; +import org.nuiton.math.matrix.MatrixND; import org.junit.Assert; import org.junit.Test; @@ -54,7 +54,7 @@ domain.setMinBound(0); domain.setMaxBound(50); factor.setDomain(domain); - factor.setPath("org.codelutin.factor#1234567890#0.12242345354#name"); + factor.setPath("org.nuiton.factor#1234567890#0.12242345354#name"); factor.setValueForIdentifier(49); Assert.assertEquals((Integer) 49, factor.getValue()); @@ -99,7 +99,7 @@ domain.getValues().put("m2", matrix2); factor.setDomain(domain); factor - .setPath("org.codelutin.math.matrix.MatrixND#563456293453#2.456347646#dim"); + .setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); factor.setValueForIdentifier("m2"); Assert.assertEquals(matrix2, factor.getValue()); @@ -144,7 +144,7 @@ domain.setOperator("*"); factor.setDomain(domain); factor - .setPath("org.codelutin.math.matrix.MatrixND#563456293453#2.456347646#dim"); + .setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); factor.setValueForIdentifier(0.1); Assert.assertEquals(0.92, factor.getValue().getValue(new int[] { 0, 0 }),0.0000001); @@ -172,7 +172,7 @@ domain2.setOperator("/"); factor2.setDomain(domain2); factor2 - .setPath("org.codelutin.math.matrix.MatrixND#563456293453#2.456347646#dim"); + .setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); factor2.setValueForIdentifier(0.1); // val + ((val / coefficient) * ((2 * Double @@ -201,7 +201,7 @@ domain3.setOperator("-"); factor3.setDomain(domain3); factor3 - .setPath("org.codelutin.math.matrix.MatrixND#563456293453#2.456347646#dim"); + .setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); factor3.setValueForIdentifier(0.1); Assert.assertEquals(0.28, factor3.getValue().getValue(new int[] { 0, 0 }),0.0000001); @@ -227,7 +227,7 @@ domain4.setOperator("+"); factor4.setDomain(domain4); factor4 - .setPath("org.codelutin.math.matrix.MatrixND#563456293453#2.456347646#dim"); + .setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); factor4.setValueForIdentifier(0.1); Assert.assertEquals(0.12, factor4.getValue().getValue(new int[] { 0, 0 }),0.0000001); @@ -257,7 +257,7 @@ domain.setReferenceValue(3.0); factor.setDomain(domain); factor - .setPath("org.codelutin.math.matrix.MatrixND#563456293453#2.456347646#dim"); + .setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); factor.setValueForIdentifier(0.1); Assert.assertEquals(2.76, factor.getValue(),0.0000001); @@ -276,7 +276,7 @@ domain2.setReferenceValue(3.0); factor2.setDomain(domain2); factor2 - .setPath("org.codelutin.math.matrix.MatrixND#563456293453#2.456347646#dim"); + .setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); factor2.setValueForIdentifier(0.1); Assert.assertEquals(-21, Double.valueOf(factor2.getValue()),0.0000001); @@ -292,7 +292,7 @@ domain3.setReferenceValue(3.0); factor3.setDomain(domain3); factor3 - .setPath("org.codelutin.math.matrix.MatrixND#563456293453#2.456347646#dim"); + .setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); factor3.setValueForIdentifier(0.1); Assert.assertEquals(0.52, Double.valueOf(factor3.getValue()),0.0000001); @@ -308,7 +308,7 @@ domain4.setReferenceValue(3.0); factor4.setDomain(domain4); factor4 - .setPath("org.codelutin.math.matrix.MatrixND#563456293453#2.456347646#dim"); + .setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); factor4.setValueForIdentifier(0.1); Assert.assertEquals(0.68, Double.valueOf(factor4.getValue()),0.0000001); Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/types/MonthTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/types/MonthTest.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/types/MonthTest.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -18,13 +18,13 @@ package fr.ifremer.isisfish.types; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.util.LinkedList; import java.util.List; -import org.codelutin.math.matrix.MatrixFactory; -import org.codelutin.math.matrix.MatrixND; +import org.nuiton.math.matrix.MatrixFactory; +import org.nuiton.math.matrix.MatrixND; import org.junit.Assert; import org.junit.Test; Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -18,7 +18,7 @@ package fr.ifremer.isisfish.ui.sensitivity; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.awt.HeadlessException; import java.util.ArrayList; @@ -31,8 +31,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixFactory; -import org.codelutin.math.matrix.MatrixND; +import org.nuiton.math.matrix.MatrixFactory; +import org.nuiton.math.matrix.MatrixND; import org.junit.Test; import fr.ifremer.isisfish.AbstractIsisFishTest; @@ -69,7 +69,7 @@ domain1.setMinBound(0); domain1.setMaxBound(50); factor1.setDomain(domain1); - factor1.setPath("org.codelutin.factor#1234567890#0.12242345354#name"); + factor1.setPath("org.nuiton.factor#1234567890#0.12242345354#name"); factor1.setValueForIdentifier(49); // matrix 1 @@ -99,7 +99,7 @@ domain2.getValues().put("m1", matrix1); domain2.getValues().put("m2", matrix2); factor2.setDomain(domain2); - factor2.setPath("org.codelutin.math.matrix.MatrixND#563456293453#2.456347646#dim"); + factor2.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); factor2.setValueForIdentifier("m2"); List<Factor<?,?>> factors1 = new ArrayList<Factor<?,?>>(); Added: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/util/ErrorHelperTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/util/ErrorHelperTest.java (rev 0) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/util/ErrorHelperTest.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -0,0 +1,58 @@ +/* *##% + * 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.ui.util; + +import java.awt.HeadlessException; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Ignore; +import org.junit.Test; + +import fr.ifremer.isisfish.AbstractIsisFishTest; + +/** + * Test class for ErrorHelper. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ + at Ignore +public class ErrorHelperTest extends AbstractIsisFishTest { + + /** Logger for this class */ + private static final Log log = LogFactory.getLog(ErrorHelperTest.class); + + @Test + public void showErrorDialogTest() { + try { + IllegalArgumentException e = new IllegalArgumentException("Just for test"); + + ErrorHelper.showErrorDialog(null, "This is an error pane test", e); + } + catch(HeadlessException e) { + if (log.isWarnEnabled()) { + log.warn("User interface non available", e); + } + } + } +} Property changes on: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/util/ErrorHelperTest.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -28,7 +28,7 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.util.FileUtil; +import org.nuiton.util.FileUtil; import org.junit.Assert; import org.junit.Test; Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java 2009-10-12 15:25:59 UTC (rev 2657) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java 2009-10-13 15:00:50 UTC (rev 2658) @@ -27,8 +27,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.util.FileUtil; -import org.codelutin.util.VersionNumber; +import org.nuiton.util.FileUtil; +import org.nuiton.util.VersionNumber; import org.junit.After; import org.junit.Assert; import org.junit.Before;

1 0

r2657 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util
by chatellier＠users.labs.libre-entreprise.org Oct. 12, 2009

Oct. 12, 2009

Author: chatellier Date: 2009-10-12 15:25:59 +0000 (Mon, 12 Oct 2009) New Revision: 2657 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CellPointcomparator.java Log: Comparator can compare Cell and Float objects. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CellPointcomparator.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CellPointcomparator.java 2009-10-12 15:23:46 UTC (rev 2656) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CellPointcomparator.java 2009-10-12 15:25:59 UTC (rev 2657) @@ -36,9 +36,9 @@ * * Last update: $Date$ by : $Author$ */ -public class CellPointcomparator implements Comparator<Cell> { // CellPointcomparator +public class CellPointcomparator implements Comparator<Object> { // CellPointcomparator - public int compare(Cell o1, Cell o2) { + public int compare(Object o1, Object o2) { if (o1 == null && o2 == null) { return 0; }

1 0

r2656 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util
by chatellier＠users.labs.libre-entreprise.org Oct. 12, 2009

Oct. 12, 2009

Author: chatellier Date: 2009-10-12 15:23:46 +0000 (Mon, 12 Oct 2009) New Revision: 2656 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CellPointcomparator.java Log: Make comparator generic Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CellPointcomparator.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CellPointcomparator.java 2009-10-02 10:09:14 UTC (rev 2655) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CellPointcomparator.java 2009-10-12 15:23:46 UTC (rev 2656) @@ -1,5 +1,6 @@ /* - * *##% Copyright (C) 2005 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * *##% Copyright (C) 2005, 2009 + * 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 published by the Free Software @@ -16,18 +17,6 @@ * Place - Suite 330, Boston, MA 02111-1307, USA. ##% */ -/******************************************************************************* - * CellPointcomparator.java - * - * Created: 6 septembre 2005 00:57:33 CEST - * - * @author Benjamin POUSSIN <poussin at codelutin.com> - * - * @version $Revision$ - * - * Last update: $Date$ by : $Author$ - */ - package fr.ifremer.isisfish.util; import java.awt.geom.Point2D; @@ -37,11 +26,19 @@ /** * Permet de comparer la position d'une Maille avec un objet Point2D, ou deux - * Mailles, ou deux Points + * Mailles, ou deux Points. + * + * Created: 6 septembre 2005 00:57:33 CEST + * + * @author Benjamin POUSSIN <poussin at codelutin.com> + * + * @version $Revision$ + * + * Last update: $Date$ by : $Author$ */ -public class CellPointcomparator implements Comparator { // CellPointcomparator +public class CellPointcomparator implements Comparator<Cell> { // CellPointcomparator - public int compare(Object o1, Object o2) { + public int compare(Cell o1, Cell o2) { if (o1 == null && o2 == null) { return 0; } @@ -71,8 +68,8 @@ lon1 = cell.getLongitude(); } else { Point2D point = (Point2D) o1; - lat1 = (float)point.getX(); - lon1 = (float)point.getY(); + lat1 = (float) point.getX(); + lon1 = (float) point.getY(); } if (o2 instanceof Cell) { @@ -81,8 +78,8 @@ lon2 = cell.getLongitude(); } else { Point2D point = (Point2D) o2; - lat2 = (float)point.getX(); - lon2 = (float)point.getY(); + lat2 = (float) point.getX(); + lon2 = (float) point.getY(); } // o1 est superieur a o2 int result = Double.compare(lat1, lat2); @@ -94,4 +91,3 @@ } } // CellPointcomparator -

1 0

r2655 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator
by chatellier＠users.labs.libre-entreprise.org Oct. 2, 2009

Oct. 2, 2009

Author: chatellier Date: 2009-10-02 10:09:14 +0000 (Fri, 02 Oct 2009) New Revision: 2655 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/AnalysePlanContext.java Log: Ajout d'un commentaire sur la method ambigue getNumber(). Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/AnalysePlanContext.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/AnalysePlanContext.java 2009-09-28 17:56:26 UTC (rev 2654) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/AnalysePlanContext.java 2009-10-02 10:09:14 UTC (rev 2655) @@ -64,8 +64,11 @@ } /** - * Get analyse plan number. + * Get current analyze plan simulation count. * + * Warning, in after simulation, refer to generated simulation count, + * not ended simulation number. + * * @return the number */ public int getNumber() {

1 0