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

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

Oct. 19, 2009

Author: chatellier Date: 2009-10-19 17:09:23 +0000 (Mon, 19 Oct 2009) New Revision: 2669 Modified: isis-fish/trunk/pom.xml Log: Dissociate generation and mapping copy (for overwrite parameter) Update eugene, topia. Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-10-19 08:11:13 UTC (rev 2668) +++ isis-fish/trunk/pom.xml 2009-10-19 17:09:23 UTC (rev 2669) @@ -449,11 +449,11 @@ <properties>  <jaxx.version>1.7.1</jaxx.version> - <topia.version>2.2.1</topia.version> + <topia.version>2.2.2-SNAPSHOT</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.1-SNAPSHOT</nuiton-widgets.version> - <eugene.version>1.0.0</eugene.version> + <eugene.version>1.0.1-SNAPSHOT</eugene.version> <jrst.version>1.0.0</jrst.version> <aspectwerkz.version>2.0</aspectwerkz.version> <xmlrpc.version>3.1.2</xmlrpc.version> @@ -536,14 +536,11 @@ <includes>**/*.objectmodel</includes> <templates>org.nuiton.topia.generator.TopiaMetaGenerator</templates> <defaultPackage>fr.ifremer.isisfish</defaultPackage> - <copyVersionDir>${basedir}/src/main/resources/oldmappings/%MODELNAME%</copyVersionDir> - <copyVersionFiles>**/*.hbm.xml</copyVersionFiles> </configuration> <goals> <goal>zargo2xmi</goal> <goal>xmi2objectmodel</goal> <goal>generate</goal> - <goal>copyVersionFiles</goal> </goals> </execution> </executions> @@ -556,6 +553,27 @@ </dependency> </dependencies> </plugin> + + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <version>${eugene.version}</version> + <executions> + <execution> + <id>copyVersionFiles</id> + <phase>generate-sources</phase> + <configuration> + <includes>**/*.objectmodel</includes> + <copyVersionDir>${basedir}/src/main/resources/oldmappings/%MODELNAME%</copyVersionDir> + <copyVersionFiles>**/*.hbm.xml</copyVersionFiles> + <overwrite>true</overwrite> + </configuration> + <goals> + <goal>copyVersionFiles</goal> + </goals> + </execution> + </executions> + </plugin> <plugin> <groupId>org.nuiton.jaxx</groupId>

1 0

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

Oct. 19, 2009

Author: chatellier Date: 2009-10-19 08:11:13 +0000 (Mon, 19 Oct 2009) New Revision: 2668 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityException.java Log: Add constructor with message only Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityException.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityException.java 2009-10-16 16:57:38 UTC (rev 2667) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityException.java 2009-10-19 08:11:13 UTC (rev 2668) @@ -34,6 +34,15 @@ private static final long serialVersionUID = -713095428835197215L; /** + * Constructor with message. + * + * @param message message + */ + public SensitivityException(String message) { + super(message); + } + + /** * Constructor with message and cause. * * @param message message

1 0

r2667 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish/simulator/sensitivity
by chatellier＠users.labs.libre-entreprise.org Oct. 16, 2009

Oct. 16, 2009

Author: chatellier Date: 2009-10-16 16:57:38 +0000 (Fri, 16 Oct 2009) New Revision: 2667 Modified: isis-fish/trunk/pom.xml isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java Log: Update nuiton-j2r et nuiton-widgets Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-10-16 15:18:12 UTC (rev 2666) +++ isis-fish/trunk/pom.xml 2009-10-16 16:57:38 UTC (rev 2667) @@ -71,7 +71,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-j2r</artifactId> - <version>1.0.0</version> + <version>1.0.1-SNAPSHOT</version> <scope>compile</scope> </dependency> @@ -452,7 +452,7 @@ <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> + <nuiton-widgets.version>1.0.1-SNAPSHOT</nuiton-widgets.version> <eugene.version>1.0.0</eugene.version> <jrst.version>1.0.0</jrst.version> <aspectwerkz.version>2.0</aspectwerkz.version> 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-16 15:18:12 UTC (rev 2666) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2009-10-16 16:57:38 UTC (rev 2667) @@ -46,8 +46,10 @@ * * @param plan Design plan of the sensitivity analysis * @param outputdirectory ??? + * + * @throws SensitivityException */ - public void setIsisFactorsR(DesignPlan plan, File outputdirectory) { + public void setIsisFactorsR(DesignPlan plan, File outputdirectory) throws SensitivityException { String nomFacteur = "nomFacteur<-c(%s)"; String factorNames = ""; @@ -157,8 +159,9 @@ String Rcall = ""; - REngine engine = new RProxy(); + try { + REngine engine = new RProxy(); //clear the engine (to be sure it's empty) log.info("rm(list=ls())"); @@ -228,7 +231,7 @@ if (log.isErrorEnabled()) { log.error("R evaluation failed", eee); } - throw new RuntimeException("R evaluation failed", eee); + throw new SensitivityException("R evaluation failed", eee); // Error while retrieving scenario }

1 0

r2666 - in isis-fish/trunk/src: main/assembly test/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org Oct. 16, 2009

Oct. 16, 2009

Author: chatellier Date: 2009-10-16 15:18:12 +0000 (Fri, 16 Oct 2009) New Revision: 2666 Added: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java Modified: isis-fish/trunk/src/main/assembly/go.bat Log: Modify windows script (add test to check that file is crlf encoded) Modified: isis-fish/trunk/src/main/assembly/go.bat =================================================================== --- isis-fish/trunk/src/main/assembly/go.bat 2009-10-15 14:10:56 UTC (rev 2665) +++ isis-fish/trunk/src/main/assembly/go.bat 2009-10-16 15:18:12 UTC (rev 2666) @@ -1 +1,19 @@ -java -Xmx1024M -Djava.library.path=jri -DR.type=jni -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 > debug.txt \ No newline at end of file + at echo off + +if NOT "%R_HOME%"=="" GOTO rfound + +:norfound +echo R_HOME not found > debug.txt +goto startisis + +:rfound +set Path=%Path%;%R_HOME%/bin +goto startisis + +:startisis +echo Isis staring... +echo R_HOME = %R_HOME% > debug.txt +java -Xmx512M -Djava.library.path=jri -DR.type=jni -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 >> debug.txt 2>&1 +goto end + +:end Added: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java (rev 0) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java 2009-10-16 15:18:12 UTC (rev 2666) @@ -0,0 +1,60 @@ +/* *##% + * 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; + +import java.io.File; +import java.io.IOException; + +import junit.framework.Assert; + +import org.apache.commons.io.FileUtils; +import org.junit.Test; + +/** + * Misc test on isis config. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class IsisFishMiscTest { + + /** + * Test that go.bat file in clrf valid for windows. + * + * If this test fail, use unix2dos command on unix. + * + * @throws IOException + */ + @Test + public void testCRLFOnBat() throws IOException { + File batFile = new File("src" + File.separator + "main" + File.separator + "assembly" + File.separator + "go.bat"); + + String content = FileUtils.readFileToString(batFile); + System.out.println(content); + String[] lines = content.split("\n"); + + // -1, last line have no \r + for (int index = 0 ; index < lines.length - 1; ++ index) { + Assert.assertTrue("File is not valide for Windows on line " + index, lines[index].endsWith("\r")); + } + } +} Property changes on: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL"

1 0

r2665 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs
by chatellier＠users.labs.libre-entreprise.org Oct. 15, 2009

Oct. 15, 2009

Author: chatellier Date: 2009-10-15 14:10:56 +0000 (Thu, 15 Oct 2009) New Revision: 2665 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java Log: Delete remote state was usefull 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-15 13:23:02 UTC (rev 2664) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java 2009-10-15 14:10:56 UTC (rev 2665) @@ -990,7 +990,8 @@ // - file is locally added // - file is remotely deleted if (!localStatus.equals(SVNStatusType.STATUS_ADDED) && - !remoteStatus.equals(SVNStatusType.STATUS_UNVERSIONED)) { + !remoteStatus.equals(SVNStatusType.STATUS_UNVERSIONED) && + !remoteStatus.equals(SVNStatusType.STATUS_DELETED)) { result = true; }

1 0

r2664 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs
by chatellier＠users.labs.libre-entreprise.org Oct. 15, 2009

Oct. 15, 2009

Author: chatellier Date: 2009-10-15 13:23:02 +0000 (Thu, 15 Oct 2009) New Revision: 2664 Modified: 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 Log: Add get local file status operation 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-14 16:45:10 UTC (rev 2663) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCS.java 2009-10-15 13:23:02 UTC (rev 2664) @@ -45,6 +45,16 @@ public static final String TYPE_SVN = "svn"; /** + * VCS Status type. + */ + public enum Status { + STATUS_NORMAL, + STATUS_ADDED, + STATUS_MODIFIED, + STATUS_DELETED, + } + + /** * can be None, CVS or SVN. only None or SVN work */ public static final String VCS_TYPE = "vcs.type"; @@ -188,6 +198,15 @@ String getDiff(File file) throws VCSException; /** + * Get file local status. + * + * @param file file to get status + * @return file status + * @throws VCSException + */ + Status getLocalStatus(File file) throws VCSException; + + /** * Return list of all file on directory on remote server. * * @param directory 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-14 16:45:10 UTC (rev 2663) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSNone.java 2009-10-15 13:23:02 UTC (rev 2664) @@ -136,6 +136,14 @@ throw new VCSException("Can't diff with dummy VCS"); } + /* + * @see fr.ifremer.isisfish.vcs.VCS#getLocalStatus(java.io.File) + */ + @Override + public Status getLocalStatus(File file) throws VCSException { + return Status.STATUS_NORMAL; + } + /** * Return list of all file on directory on remote server. * 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-14 16:45:10 UTC (rev 2663) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java 2009-10-15 13:23:02 UTC (rev 2664) @@ -567,6 +567,35 @@ } } + /* + * @see fr.ifremer.isisfish.vcs.VCS#getLocalStatus(java.io.File) + */ + @Override + public Status getLocalStatus(File file) throws VCSException { + + Status resultStatus = Status.STATUS_NORMAL; + + try { + SVNStatusClient statusClient = getSVNManager().getStatusClient(); + SVNStatusType svnStatus = statusClient.doStatus(file, false).getContentsStatus(); + + if (svnStatus == SVNStatusType.STATUS_MODIFIED) { + resultStatus = Status.STATUS_MODIFIED; + } + else if (svnStatus == SVNStatusType.STATUS_DELETED) { + resultStatus = Status.STATUS_DELETED; + } + else if (svnStatus == SVNStatusType.STATUS_ADDED || svnStatus == SVNStatusType.STATUS_UNVERSIONED) { + resultStatus = Status.STATUS_ADDED; + } + + } catch (SVNException e) { + throw new VCSException("Can't get local status", e); + } + + return resultStatus; + } + /** * Recherche le statut des fichiers locaux, ne retourne jamais les fichiers * NORMAL ou NONE sauf si demandé explicitement via wanted @@ -946,8 +975,7 @@ try { SVNStatusClient statusClient = getSVNManager().getStatusClient(); - SVNStatus status = statusClient - .doStatus(localFile, true /*remote*/); + SVNStatus status = statusClient.doStatus(localFile, true /*remote*/); SVNStatusType localStatus = status.getContentsStatus(); SVNStatusType remoteStatus = status.getRemoteContentsStatus(); @@ -957,12 +985,12 @@ localFile.getAbsolutePath(), localStatus, remoteStatus)); } - + // don't return true if: // - file is locally added // - file is remotely deleted - if (!localStatus.equals(SVNStatusType.STATUS_ADDED) - && !remoteStatus.equals(SVNStatusType.STATUS_DELETED)) { + if (!localStatus.equals(SVNStatusType.STATUS_ADDED) && + !remoteStatus.equals(SVNStatusType.STATUS_UNVERSIONED)) { result = true; }

1 0

r2663 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish/map src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org Oct. 14, 2009

Oct. 14, 2009

Author: chatellier Date: 2009-10-14 16:45:10 +0000 (Wed, 14 Oct 2009) New Revision: 2663 Modified: isis-fish/trunk/pom.xml isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java Log: Update openmap (no ssx file needed) Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-10-14 10:41:07 UTC (rev 2662) +++ isis-fish/trunk/pom.xml 2009-10-14 16:45:10 UTC (rev 2663) @@ -187,7 +187,7 @@ <dependency> <groupId>openmap</groupId> <artifactId>openmap</artifactId> - <version>4.6.4</version> + <version>4.6.5</version> <scope>compile</scope> </dependency> 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-14 10:41:07 UTC (rev 2662) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java 2009-10-14 16:45:10 UTC (rev 2663) @@ -283,7 +283,8 @@ String lineColor, String fillColor) { Properties p = new Properties(); p.setProperty(id+"."+ShapeLayer.shapeFileProperty, shapeFile); - p.setProperty(id+"."+ShapeLayer.spatialIndexProperty, spatialIndex); + // unneeded with openmap 4.6.5 + //p.setProperty(id+"."+ShapeLayer.spatialIndexProperty, spatialIndex); p.setProperty(id+"."+DrawingAttributes.linePaintProperty, lineColor); p.setProperty(id+"."+DrawingAttributes.fillPaintProperty, fillColor); ShapeLayer slayer = new ShapeLayer(); 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-14 10:41:07 UTC (rev 2662) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-10-14 16:45:10 UTC (rev 2663) @@ -1078,8 +1078,8 @@ File destShp = new File(destDir, basename + ".shp"); FileUtil.copy(shp, destShp); - // copy ssx file - File destSsx = new File(destDir, basename + ".ssx"); + // copy ssx file (unneeded with openmap 4.6.5) + /*File destSsx = new File(destDir, basename + ".ssx"); if (ssx.exists()) { FileUtil.copy(ssx, destSsx); } else { @@ -1087,7 +1087,7 @@ log.info("Ssx file don't exist, try to generate it"); } SpatialIndex.createIndex(destShp.getPath(), destSsx.getPath()); - } + }*/ List<String> maps = fisheryRegion.getMapFileList(); maps.add(basename);

1 0

r2662 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org Oct. 14, 2009

Oct. 14, 2009

Author: chatellier Date: 2009-10-14 10:41:07 +0000 (Wed, 14 Oct 2009) New Revision: 2662 Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Fix some status messages 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-14 07:43:02 UTC (rev 2661) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-10-14 10:41:07 UTC (rev 2662) @@ -607,9 +607,9 @@ isisfish.message.copy.finished=Copie termin\u00E9e isisfish.message.copy.region=Copier la r\u00E9gion vers %1$s isisfish.message.creating.region=En train de cr\u00E9er la r\u00E9gion %1$s -isisfish.message.creation.done=cr\u00E9ation termin\u00E9e %1$s +isisfish.message.creation.done=Cr\u00E9ation termin\u00E9e %1$s isisfish.message.creation.finished=Cr\u00E9ation termin\u00E9e -isisfish.message.delete.canceled=supression annul\u00E9e +isisfish.message.delete.canceled=Suppression annul\u00E9e isisfish.message.delete.entities=Supprimer les entit\u00E9s isisfish.message.delete.entity=Supprimer l'entit\u00E9 isisfish.message.delete.finished=Suppression termin\u00E9e

1 0

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